customer view refactor