if and else statements commented out
omits commented out if and else statements and adds ternary