Tidy up a bit
Formatting