cosmetics refactoring in SelectorBuilder