Web runner refactoring