cleaned up index
Merge branch 'clean1'