Refactor delegates

Change: delegate keyword to lambda expressions.
Change: rename and switch to existing method delegates.