Changed to Enum
Using Enumerators to store values
Reduced so much of code :-)