More changes for the presentation and full tidy up