Dependency checker refactoring