cleaning up the codebase