More tidy up

Formatting changes only, no code changes