refactoring and added customer service
refactoring