more tidying up of Farq code