tidying up part 2