Tidy up - revising up to initial parallelisation.