More code formatting changes