Minor updates to style and comments.