A bit of tidy up