Tidying up a few things