index comments clean-up