tidy up a bit