Move variables into scope