Formatting changes and comments.