Formatting changes from formatter