minor tidyups