Fix up comments
Refactor index