Small refactoring
Refactoring lensing