Improve readability of code

Based on feedback:

- Update comment to match method name and use correct 'there'
- Use precence of state.subsection rather than using an indexOf for
  explicit clarity
- Use a clearer variable name for data cache