Refactoring of selectors before I start with extend: #151