Cleaning, adding index