Formatting changes and fixes.