String refactoring
Merge pull request #449 from danielsoro/string-refactoring

String refactoring