A bit of a tidyup