Refactor strings working