changed lenses to a more OO style

fixes #2