simplified some lambda-expresssions