More minor tidying