Formatting changes & cleanup