Add an assert
Remove unnecessary loop variable initializer