Code Review

Ok, this is a little bit weird, because GitHub is bad at doing full-repo code reviews. Normally what is in pink is being removed - in this case, you can ignore the colorization. Comments inline - I'll focus on style and convention, and assume that everything works already :)