refactored selectors into own object