Removed duplicate variables moved some others.