tiny bit of tidyup