cleaned up index a bit more