Move default statement at the end of switch body (#890)

Move default statement at the end of switch body (#890) #653