Minor Changes

Minor changes to the function putting one name ahead of the other,
removed old code at front when I was designing the function differently.