refactor: cleanup handlers