Putting else in block

All if-else should be in blocks