Cleaned up views per Jonathan's review.
Merge pull request #80 from WoundTeam/view_cleanup

Cleaned up views per Jonathan's review.