lens refactoring