Div. Cleanup to NamePicker and Testing