Another cleaning.

More tidying up.