Sprinkle on some OO

Functionally the same, but arguably makes the code more readable.