Cosmetics: rename loop counter vars to i,j