refactor handler
...