Some style fixes to user management code