Adding customer info and minor refactoring