Improve style of index a bit