Logic Ops: code cleanup

No functional changes and only code cleanup.