Refactoring package to use MVC terms Refactoring dialog fragment views to remove warnings Refactoring dialog fragment code to remove warnings