Minor tweaks.
Meh, hard wrap the lines.
Merge remote-tracking branch 'jake/master' into oop-refactor