WIP: Cleanup view helper a bit