Refactor dialog handler calls