Formatting tidy-up

Ahh nice and tidy :-)