refinement: simplify delgate code.