Simplyfied logic, once a string always a string.
Merge pull request #28 from ST-DDT/CodeCleanup2

Simplyfied logic, once a string always a string.