EMFourMomBuilder tidy up

Lucy Lewittrequested to merge
llewitt/athena:EMFourMomBuilderTidyUp into main

Reorganises the logic a little to be more readable.

Merge request reports