Clean-up dialog fragment creation and call-backs even further