cleaning up index a bit