Refactor customer views