Minor formatting tidyup