Much better. You'll want to wrap the and'd conditional in parentheses to make it clear the logic is correct.