Review -- DO NOT MERGE

This is just a friendly review, don't actually merge this. I had some comments, mostly style, YMMV.