Fixed indentation, Refactored To Use 'Switch' In Enumeration