Codebase optimization

shape