improving the codebase