tidying up build