The last condition is always true if the middle condition is true, no need to have both.

Also, you've changed the code flow, did you check that the logic behind the code is the same?