Switch replaced with simpler code

To @ascott1, with love :heart: :heart: :heart: 


![selfie-0](http://i.imgur.com/IunbfQ3.gif)


(That is supposed to look all lovey, but it came out very creepy.)