Reformat code prior to refactoring