Cleaning up codebase