minor tidying up