More optimization of the codebase