Merge pull request #10226 from buddhamagnet/master

Make [] method more readable