Tidy-up some code formatting