Optimized index
Code cleanup
Merge pull request #28 from Hydrothermal/dev

Dev