Changed code to use enum not static strings

- Its less error prone that way