Reformat to tidy-up