cleaned all code
new index