Cleaning up stuff a bit, making his classes