Refactor tone