Added ternary if expression
Fixed empty return is a valid statement