[#1747] Swap logic to remove not and aid readability