Stringification refactoring