tidy up a bit of mess