Pull in formatting and refactoring.