tidying up, minor changes