More minor tidying of code.