removed needless argument for cloning
Chaninging variables name to follow our policy.