Refactored to consolidate filepath and primary email