Further tidy up and structuring.