Fixed Version: Redundant blocks in if-else statement