Clean on generated code #2
Add std:: for string and vector
Clean on generated code #3