name cleaning
fixing indexes