DialogFragment Refactoring