Improving select switch example
Cleanup