Clean up enum switches