Refactor in favor of Runner