Cleaned up some class definitions.