General fixes
Cleaned up a few classes