improving codebase