[Refactor]

  - Removes innecesary selectors
  - Optimization of selectors.