remove elvis operator
add conditional expression