Minor tweaks and pep8 fixes.
Merge branch 'PR-849_minor_notifier_changes' into development

* PR-849_minor_notifier_changes:  closes gh-849
  Minor tweaks and pep8 fixes.