Formatting tidy-up part 2