Formatting changes and cleanup