Cleaned up some comments and class definitions.