some minor tidying