Revert "use indexing where necessary"

This reverts commit 092e758824bec88e0667571fd5334b664ce19dff.