generally tidying up a bit