Logic Ops: code cleanup
Merge pull request #3069 from raven02/patch-10

Logic Ops: code cleanup