Refactor: Cleaner not to convert to a string.