But taking advantages of range-for loops is even better

Change-Id: I79c6721ca63482c0ed40dad828ba736eeae92b6c