Refactor CustomerInfo Object (last commit)