Some minor tidying up.

Reverted back.