Con 1707

Please make variable names more descriptive and remove unused ```$i1```.