tidying up a little bit