A bit more of a tidyup