cleanup index a bit