lambda simplify; close #15