Minor Code Cleaning

Switched to switch