more refactoring for cutomerservice