Reorder switch statement to be less non-sensical