minor tidying