Same here. At the very least put the body of the switch case into its own method.