Removed some unnessesary else clauses