Refactor delegates for clarity.