simplifying refactor
Well, that was embarassing.