Cleaning up the Class Central look