Replace lambda function with operator call

Refactor FTW