refactoring ICompany, IPerson customers