Cleanup the rest of the classes
Merge pull request #9 from samrg472/master

Finish a lot more cleanup