removed ternary operator