Class Cleanup
Merge pull request #2 from logan-yliniemi/master

Class Cleanup