This is to simplify future commits, avoiding mixing intended change and whitespace reformatting that can be done user-side
