tidying up various things