Formatting cleanup and comments.