Cleaned up first section
Cleaned up more cruft
Cleaned up class section