Code review :D

I'm just dumping my stream-of-code-review commits here so I can get comments on them. I'm sure some of these suggestions are dumb :)