Lambda refactoring cleanup