happy refactor
another sexy refactor