Selenium evaluator refactoring