Formatting changes to some files