Some minor tidying