Cleanup

I'm going through the code and fixing small things here and there that I've thought about earlier.

Not done yet, getting this going for the nice diff & so that I can let Travis run the tests for me.