-Beautify index a little bit