Wrapping helpers in a class. General cleanup.