Code formatting tidy-ups only