cleaned a bit the index