Improve how we decode strings