Removed instances of company_name and replaced with company object