Rewrite and tidy up of performance section