refacotoring handler construction