Refactor reverter