some minor tidying only