Refactoting operator classes