Change switch for if-then-else blocks, comments