Refactoring divers