Minor format change.
Minor code reorganisation.