MINOR tidyups