minor tidyings