Some tidy-up formatting