Code clean-up
Support string constants