Reorder case statement