a bit of refactoring for uniformity of lenses