Changed name of iteration variable because of potential override. Removed completed TODOs.