Cleaned up index