Refactor products index methods*