Refactor divers