Some rafactoring in WordSelector class