Bit of tidyup