Code reformatting

Convert to Lambda