Log indexing, clean up comments