Removed ternary operator