Updating: minor tidying-up