used lambda expressions and method references where possible, reducing the need for extraneous code blocks.

Comment From: snicoll

@alidandach thank you but these are largely subjective and we prefer to do such changes ourselves.