tidy up a few things