Improve variable naming (i, ii, iii)