Formatting changes and debugging code cleanup