Correctly define class constants (+ little cleanup)
More cleanup, drop unused callback in run function