Add new user rename script
Formatting cleanup