Code review clean up and comments.