refactor

removed redundant selectors