Fix it to instantiate notifier only once

While I'm here do a PEP8 cleanup