Another minor cleanup
Use index not name to access results