Improve codebase