Minor updates, whitespace and comments.