Formatting tidy-up part 1