Indentation, exception handling for dialog on callback
Minor fixes
Minor fix
Merge pull request #2 from feresr/Code_refactor_1

Code refactor 1