simplify the handler