Formatting changes and comment removal.