Cleaning and re-organising to ensure alignment with thesis