Refactor GumHelper

No change to how it works, just tidied it up.