Refactor strings

@avogel This is a pretty big deal. I think it deserves a bigger bump :)