A little more tidying up of requirements