index: whitespace cleanup
index: improved logging