Cleaning up big classes