Reformat prior to code changes