Output Cleanup

Formatting cleanup; handle names that contain 'and Family.'