(TK-3) Change names in for

Change names in for bindings to be more descriptive of what
the variables represent. Also, remove superfluous line from
init function.