Re-work and tidy up