Change indicator type variable to i, as used in comments