refinement: simplify handler.