Consistent view reference

Some things I noticed during reading.
Two more view references
Merge pull request #508 from J-Hannes/patch-2

Consistent view reference