Lens refactor