Fixed If/Else clauses.