Select: refactoring.