Tidy up indenting for clarity in refactoring.