refactored indexes
minor