Cleaning up the codebase