Removed unreachable code
The 'and', 'or' operators does not have the same precedence as && and ||. This could lead to unexpected behavior