Refactored underwriting person/business