Updates after review
Updates after review

Metaswitch/clearwater-monit,ClearwaterCore/clearwater-monit,Metaswitch/clearwater-monit,Metaswitch/clearwater-monit,ClearwaterCore/clearwater-monit,ClearwaterCore/clearwater-monit