Logic Ops: code cleanup