Pure code janitoring: Shuffled the order of some of the case statements