separate, simplify, op handlers in new file