Refactor customer management