Remove useless abstraction
Simplify ternary condition