cleaned up operator a bit