Addressing feedback from code review - removing unnecessary element references in selectors