Start of major tidy up.
More tidying.