Minor cleanup
Add smaple_indexes fn