Refactored operator, deleted a bunch of lines