Refactoring Bundler and PowDns checks