Divers refactor