tidying things up a bit