Some minor cleaning up [ci skip].
Simplified our view interface.