Refactored Switch to Enum - thanks to @ousado