Adjust decoupling notifier settings.
Minor codestyle changes.