a bit of refactoring for uniformity of lenses
Merge branch 'master' of github.com:nodename/lenses