Some minor tidying up