minor tidying up of controllers