Style and formatting changes.