Stringification refactoring/improvements