Reformat and a bit of refactoring.