Delete the no-longer-used BatchCloner
Address issues raised in code review

Minor variable renaming.