Refactor helpers to return unicode strings