tidying up to move to new repo