Remove a local variable `i`
Merge branch 'pr/2'