Simplify lamblas
Refactoring