A bit of a tidy up but no real work