Slightly refactored
Deleted unused selectors