I agree, and also I want to limit this pull request to changes needed to get selenium grid running. Let's save that for another refactoring round.