diff --git a/src/connectivity/sip_utils.cpp b/src/connectivity/sip_utils.cpp
index 2e0582e0acdd15a137164876a5a1fc0df0d70e49..86cf801f49b5dadc44f37eae8fdb30a1c10b3b96 100644
--- a/src/connectivity/sip_utils.cpp
+++ b/src/connectivity/sip_utils.cpp
@@ -175,7 +175,7 @@ void
 addContactHeader(const std::string& contactHdr, pjsip_tx_data* tdata)
 {
     if (contactHdr.empty()) {
-        JAMI_WARN("Contact header won't be added (empty string)");
+        JAMI_WARN("Contact header is unable to be added (empty string)");
         return;
     }
 
diff --git a/src/jamidht/account_manager.cpp b/src/jamidht/account_manager.cpp
index 2043acdc1e99178327fe0baf9b07530250bc514b..990b84ca4674f87b1d4dbf6b0393adcd76791244 100644
--- a/src/jamidht/account_manager.cpp
+++ b/src/jamidht/account_manager.cpp
@@ -312,7 +312,7 @@ AccountManager::startSync(const OnNewDeviceCb& cb, const OnDeviceAnnouncedCb& dc
         });
         dht_->listen<dht::crypto::RevocationList>(h, [this](dht::crypto::RevocationList&& crl) {
             if (crl.isSignedBy(*info_->identity.second->issuer)) {
-                JAMI_DEBUG("found CRL for account.");
+                JAMI_DEBUG("Found CRL for account.");
                 certStore()
                     .pinRevocationList(info_->accountId,
                                        std::make_shared<dht::crypto::RevocationList>(
@@ -322,7 +322,7 @@ AccountManager::startSync(const OnNewDeviceCb& cb, const OnDeviceAnnouncedCb& dc
         });
         syncDevices();
     } else {
-        JAMI_WARNING("Unable to announce device: no announcement...");
+        JAMI_WARNING("Unable to announce device: no announcement.");
     }
 
     auto inboxKey = dht::InfoHash::get("inbox:" + info_->devicePk->getId().toString());
@@ -723,7 +723,7 @@ AccountManager::sendTrustRequest(const std::string& to,
     forEachDevice(toH,
                   [this, toH, convId, payload](const std::shared_ptr<dht::crypto::PublicKey>& dev) {
                       auto to = toH.toString();
-                      JAMI_WARNING("sending trust request to: {:s} / {:s}",
+                      JAMI_WARNING("Sending trust request to: {:s} / {:s}",
                                    to,
                                    dev->getLongId().toString());
                       dht_->putEncrypted(dht::InfoHash::get("inbox:" + dev->getId().toString()),
@@ -798,7 +798,7 @@ AccountManager::forEachDevice(
         void ended()
         {
             if (remaining == 0 && onEnd) {
-                JAMI_DEBUG("Found {:d} devices", treatedDevices.size());
+                JAMI_DEBUG("Found {:d} device(s)", treatedDevices.size());
                 onEnd(not treatedDevices.empty());
                 onDevice = {};
                 onEnd = {};
diff --git a/src/manager.cpp b/src/manager.cpp
index a04b1336958819dd2509a9722e44983fde7aaaf6..2e755fa0fff3407a3e5c0d334a6bf9f5bd29b822 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -1090,7 +1090,7 @@ Manager::outgoingCall(const std::string& account_id,
                       const std::string& to,
                       const std::vector<libjami::MediaMap>& mediaList)
 {
-    JAMI_DBG() << "try outgoing call to '" << to << "'"
+    JAMI_DBG() << "Attempt outgoing call to '" << to << "'"
                << " with account '" << account_id << "'";
 
     std::shared_ptr<Call> call;
@@ -1230,7 +1230,7 @@ Manager::onHoldCall(const std::string&, const std::string& callId)
         try {
             result = call->onhold([=](bool ok) {
                 if (!ok) {
-                    JAMI_ERR("hold failed for call %s", callId.c_str());
+                    JAMI_ERR("Hold failed for call %s", callId.c_str());
                     return;
                 }
                 removeAudio(*call); // Unbind calls in main buffer
@@ -1269,7 +1269,7 @@ Manager::offHoldCall(const std::string&, const std::string& callId)
     try {
         result = call->offhold([=](bool ok) {
             if (!ok) {
-                JAMI_ERR("off hold failed for call %s", callId.c_str());
+                JAMI_ERR("Off hold failed for call %s", callId.c_str());
                 return;
             }
 
@@ -1356,7 +1356,7 @@ Manager::holdConference(const std::string& accountId, const std::string& confId)
 bool
 Manager::unHoldConference(const std::string& accountId, const std::string& confId)
 {
-    JAMI_DBG("[conf:%s] un-holding conference", confId.c_str());
+    JAMI_DBG("[conf:%s] Unholding conference", confId.c_str());
 
     if (const auto account = getAccount(accountId)) {
         if (auto conf = account->getConference(confId)) {
diff --git a/src/media/media_attribute.h b/src/media/media_attribute.h
index c6267fd32bfabdb706ac19a6152736516be6b919..f5ebfe9edea2c45fe91dd16f6ed28ae2aed2825c 100644
--- a/src/media/media_attribute.h
+++ b/src/media/media_attribute.h
@@ -86,9 +86,9 @@ public:
     bool onHold_ {false};
 
     // NOTE: the hold and mute attributes are related but not
-    // tightly coupled. A hold/un-hold operation should always
+    // tightly coupled. A hold/unhold operation should always
     // trigger a new re-invite to notify the change in media
-    // direction.For instance, on an active call, the hold action
+    // direction. For instance, on an active call, the hold action
     // would change the media direction attribute from "sendrecv"
     // to "sendonly". A new SDP with the new media direction will
     // be generated and sent to the peer in the re-invite.
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 3e00a190e7f052621517a4cbcd4454dd33fade50..1f250d21f7a7d55ddb48ca8d43700d92e7564f8a 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -216,7 +216,7 @@ SIPCall::configureRtpSession(const std::shared_ptr<RtpSession>& rtpSession,
                              const MediaDescription& localMedia,
                              const MediaDescription& remoteMedia)
 {
-    JAMI_DBG("[call:%s] Configuring [%s] rtp session",
+    JAMI_DBG("[call:%s] Configuring [%s] RTP session",
              getCallId().c_str(),
              MediaAttribute::mediaTypeToString(mediaAttr->type_));
 
@@ -2019,7 +2019,7 @@ SIPCall::initMediaStreams(const std::vector<MediaAttribute>& mediaAttrList)
                    stream.mediaAttribute_->toString(true));
     }
 
-    JAMI_DEBUG("[call:{:s}] Created {:d} Media streams", getCallId(), rtpStreams_.size());
+    JAMI_DEBUG("[call:{:s}] Created {:d} media stream(s)", getCallId(), rtpStreams_.size());
 
     return rtpStreams_.size();
 }
@@ -3047,7 +3047,7 @@ SIPCall::openPortsUPnP()
      * No need to request mappings for specfic port numbers. Set the port to '0' to
      * request the first available port (faster and more likely to succeed).
      */
-    JAMI_DBG("[call:%s] Opening ports via UPNP for SDP session", getCallId().c_str());
+    JAMI_DBG("[call:%s] Opening ports via UPnP for SDP session", getCallId().c_str());
 
     // RTP port.
     upnp_->reserveMapping(sdp_->getLocalAudioPort(), dhtnet::upnp::PortType::UDP);
@@ -3647,7 +3647,7 @@ SIPCall::setupIceResponse(bool isReinvite)
     // Media transport changed, must restart the media.
     mediaRestartRequired_ = true;
 
-    // WARNING: This call blocks! (need ice init done)
+    // WARNING: This call blocks! (need ICE init done)
     addLocalIceAttributes();
 }