Addressing pull request comments

  * Avoid `n+1` queries
  * Rename helper
  * Move active record call inside helper