tidying up a bit...