Removed unneeded references to 'i'