refactor helper selectors a bit