make index more clean