A little more class refactoring because I'm bored. Less LOC, more functions!