Improve Name Picker code a bit