Code review comments

I'm not quite done yet.