review comments - cleanup ColumnSelectorFactory