Cleaning up the Codebase