Remove if statement, simplify tests