Code Cleanup: CompanyMaster and CompanyVisit