Refined last name algorithm a little more