Minor refactoring.
Small refactoring.
Refactoring selection class.