removed lots of useless else: constructs