Polishing a bit the code. Removing not necessary indexes