Cleanup view helper
Merge pull request #10059 from mmun/cleanup-view-helper

Cleanup view helper