Avoid code duplication between serial and parallel code

[astrofrog]

At the moment there is a bit of code duplication between serial and parallel modes - this is prone to mistakes which could cause them to get out of sync. There's no reason these have to be separate, I think we can reorganize the code a little so that there is a common 'core' of code for each algorithm.