refactor lambda expressions

refactor lambda expressions