Use reader instead of indexing
Clarify a couple of calls