Lots of code formatting changes.