Cleaning up class definitions.