Started to clean up the class definitions.