tidying up the source