Minor fixup, use and instead of nested if