Some minor tidying up.
/Y.