minor tidying up.