Tidy up a few things