Cleaned up where the string to enum method should belong