Optimized index
Code cleanup