Formatting tidy-up