as per review, some minor tidies