Refactoring: dvonn