fixed name / cleaned ternary