Formatting changes and comments