More code formatting changes.