Cleaned up a few classes. Goodnight.