a little bit of code tidy-up