small code tidy-up