Cleaned up the class definitions.