Switchified If, ElseIf statement

Also updated comments