Cleaned up a class definition.