Formatting changes to main files.