minor refactoring in customers