Code style tidy-up