NOTIFPLT-47:  Implement some suggestions from the PR