Formatting changes for the first refactoring.