tidying up utils and config