Clean up

Removing some blanks and cleaning up the classes before adding new stuff