Refactor strings