Whitespace wonky, and some code comments.