tidying up a few things