Fix nitpick comments and code typos.

@danielsdeleo can you check this out?