Halfway done

Apologies depending on when you looked at the code. I refactored it half a dozen times after posting this :-o

Just looked this morning so it seems pretty clear.

Cool - thanks!