Refactored: Index