removing stupid ternary condition