Clean up index a little