diff --git a/src/media/system_codec_container.cpp b/src/media/system_codec_container.cpp
index 77f08c7ea3eac94d5f11930e52abf9b8637b9ab0..4f9e3d7ee938334cf4ef0acfe2686088c1fb4321 100644
--- a/src/media/system_codec_container.cpp
+++ b/src/media/system_codec_container.cpp
@@ -245,8 +245,8 @@ SystemCodecContainer::checkInstalledCodecs()
                 codecIt->codecType = (CodecType)((unsigned) codecType & ~CODEC_DECODER);
         }
     }
-    JAMI_INFO("Encoders found: %s", enc_ss.str().c_str());
-    JAMI_INFO("Decoders found: %s", dec_ss.str().c_str());
+    JAMI_INFO("Encoder(s) found: %s", enc_ss.str().c_str());
+    JAMI_INFO("Decoder(s) found: %s", dec_ss.str().c_str());
 }
 
 std::vector<std::shared_ptr<SystemCodecInfo>>
@@ -256,7 +256,7 @@ SystemCodecContainer::getSystemCodecInfoList(MediaType mediaType)
         return availableCodecList_;
 
     // otherwise we have to instantiate a new list containing filtered objects
-    // must be destroyed by the caller...
+    // must be destroyed by the caller…
     std::vector<std::shared_ptr<SystemCodecInfo>> systemCodecList;
     for (const auto& codecIt : availableCodecList_) {
         if (codecIt->mediaType & mediaType)
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index 63a905c6f2c65298ee0e9bfda8aa6f20fa5b6a28..a5f337849db335dd090782f531bf39f492948271 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -68,7 +68,7 @@ SipTransport::SipTransport(pjsip_transport* t)
     : transport_(nullptr, deleteTransport)
 {
     if (not t or pjsip_transport_add_ref(t) != PJ_SUCCESS)
-        throw std::runtime_error("invalid transport");
+        throw std::runtime_error("Invalid transport");
 
     // Set pointer here, right after the successful pjsip_transport_add_ref
     transport_.reset(t);
@@ -180,7 +180,7 @@ SipTransport::getTlsMtu()
                   * This method is broken by definition.
                   * A MTU should not be defined at this layer.
                   * And a correct value should come from the underlying transport itself,
-                  * not from a constant...
+                  * not from a constant…
                   */
 }
 
@@ -195,7 +195,7 @@ SipTransportBroker::~SipTransportBroker()
     udpTransports_.clear();
     transports_.clear();
 
-    JAMI_DBG("destroying SipTransportBroker@%p", this);
+    JAMI_DBG("Destroying SipTransportBroker@%p…", this);
 }
 
 void
@@ -203,9 +203,9 @@ SipTransportBroker::transportStateChanged(pjsip_transport* tp,
                                           pjsip_transport_state state,
                                           const pjsip_transport_state_info* info)
 {
-    JAMI_DBG("pjsip transport@%p %s -> %s", tp, tp->info, SipTransport::stateToStr(state));
+    JAMI_DBG("pjsip transport@%p %s → %s", tp, tp->info, SipTransport::stateToStr(state));
 
-    // First make sure that this transport is handled by us
+    // First ensure that this transport is handled by us
     // and remove it from any mapping if destroy pending or done.
 
     std::shared_ptr<SipTransport> sipTransport;
@@ -334,13 +334,13 @@ SipTransportBroker::getTlsListener(const dhtnet::IpAddr& ipAddress, const pjsip_
 {
     RETURN_IF_FAIL(settings, nullptr, "TLS settings not specified");
     RETURN_IF_FAIL(ipAddress, nullptr, "Unable to determine IP address for this transport");
-    JAMI_DEBUG("Creating TLS listener on {:s}...", ipAddress.toString(true));
+    JAMI_DEBUG("Creating TLS listener on {:s}…", ipAddress.toString(true));
 #if 0
     JAMI_DBG(" ca_list_file : %s", settings->ca_list_file.ptr);
     JAMI_DBG(" cert_file    : %s", settings->cert_file.ptr);
-    JAMI_DBG(" ciphers_num    : %d", settings->ciphers_num);
+    JAMI_DBG(" ciphers_num  : %d", settings->ciphers_num);
     JAMI_DBG(" verify server %d client %d client_cert %d", settings->verify_server, settings->verify_client, settings->require_client_cert);
-    JAMI_DBG(" reuse_addr    : %d", settings->reuse_addr);
+    JAMI_DBG(" reuse_addr   : %d", settings->reuse_addr);
 #endif
 
     pjsip_tpfactory* listener = nullptr;
diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp
index 4f6fbc26e72e722818c057c19336ea23eaa53cef..0c047e50e56ec6882a7954571c5e5c996fe8ec3a 100644
--- a/src/sip/sipvoiplink.cpp
+++ b/src/sip/sipvoiplink.cpp
@@ -327,7 +327,7 @@ transaction_request_cb(pjsip_rx_data* rdata)
                     pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &STR_MESSAGE_ID, nullptr);
                 std::string id = {};
                 if (!msgId) {
-                    // Supports imdn message format https://tools.ietf.org/html/rfc5438#section-7.1.1.3
+                    // Supports IMDN message format https://tools.ietf.org/html/rfc5438#section-7.1.1.3
                     constexpr pj_str_t STR_IMDN_MESSAGE_ID = jami::sip_utils::CONST_PJ_STR(
                         "imdn.Message-ID");
                     msgId = (pjsip_generic_string_hdr*)
@@ -413,7 +413,7 @@ transaction_request_cb(pjsip_rx_data* rdata)
     // The username can be used to join specific calls in conversations
     call->toUsername(std::string(toUsername));
 
-    // FIXME : for now, use the same address family as the SIP transport
+    // FIXME: for now, use the same address family as the SIP transport
     auto family = pjsip_transport_type_get_af(
         pjsip_transport_get_type_from_flag(transport->get()->flag));
 
@@ -457,7 +457,7 @@ transaction_request_cb(pjsip_rx_data* rdata)
     pjsip_dialog* dialog = nullptr;
     if (pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, nullptr, &dialog)
         != PJ_SUCCESS) {
-        JAMI_ERR("Unable to create uas");
+        JAMI_ERR("Unable to create UAS");
         call.reset();
         try_respond_stateless(endpt_,
                               rdata,
@@ -741,7 +741,7 @@ SIPVoIPLink::~SIPVoIPLink() {}
 void
 SIPVoIPLink::shutdown()
 {
-    JAMI_DBG("Shutdown SIPVoIPLink@%p...", this);
+    JAMI_DBG("Shutting down SIPVoIPLink@%p…", this);
     // Remaining calls should not happen as possible upper callbacks
     // may be called and another instance of SIPVoIPLink can be re-created!
 
@@ -759,7 +759,7 @@ SIPVoIPLink::shutdown()
     pj_caching_pool_destroy(&cp_);
     sipTransportBroker.reset();
 
-    JAMI_DBG("SIPVoIPLink@%p is shutdown", this);
+    JAMI_DBG("SIPVoIPLink@%p shutdown successfully completed", this);
 }
 
 std::shared_ptr<SIPAccountBase>
@@ -774,7 +774,7 @@ SIPVoIPLink::guessAccount(std::string_view userName,
              server.data(),
              (int) fromUri.size(),
              fromUri.data());
-    // Try to find the account id from username and server name by full match
+    // Attempt to find the account id from username and server name by full match
 
     std::shared_ptr<SIPAccountBase> result;
     std::shared_ptr<SIPAccountBase> IP2IPAccount;
@@ -857,7 +857,7 @@ static void
 invite_session_state_changed_cb(pjsip_inv_session* inv, pjsip_event* ev)
 {
     if (inv == nullptr or ev == nullptr) {
-        throw VoipLinkException("unexpected null pointer");
+        throw VoipLinkException("Unexpected null pointer");
     }
 
     auto call = getCallFromInvite(inv);
@@ -1022,7 +1022,7 @@ sdp_create_offer_cb(pjsip_inv_session* inv, pjmedia_sdp_session** p_offer)
     }
 
     auto family = pj_AF_INET();
-    // FIXME : for now, use the same address family as the SIP transport
+    // FIXME: for now, use the same address family as the SIP transport
     if (auto dlg = inv->dlg) {
         if (dlg->tp_sel.type == PJSIP_TPSELECTOR_TRANSPORT) {
             if (auto tr = dlg->tp_sel.u.transport)