Merge pull request #190 from gregburton/master

Code cleanup for all views