simplify handlers/* a bit