Cleaning up codebase.