Cleanup code/ Class renaming