Formatting changes and a small optimization.