Added else to if statement
Added lots of operators and made else optional