Cleaned up code some

The marking guide mentions consistency and code style, so I went through and tried to clean things up a little.
I also deleted a few unused classes.