tidying up a bit
no really, tidying up