diff --git a/src/Chat/Chat.cpp b/src/Chat/Chat.cpp
index 2bd7d68..1783b36 100644
--- a/src/Chat/Chat.cpp
+++ b/src/Chat/Chat.cpp
@@ -49,6 +49,8 @@ ChatMemoEditRequest::ChatMemoEditRequest(QWidget* parent) : QTextEdit(parent) {
     QObject::connect(this, &QTextEdit::textChanged, this, &ChatMemoEditRequest::updateDisplayChatRequest);
 }
 
+
+// TODO: unify this with updateDisplayChat()
 void ChatMemoEditRequest::updateDisplayChatRequest() {
     QString txt = this->toPlainText();
     if (lenDisplayLabelchatRequest)
@@ -98,7 +100,6 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
                 (p.getName() == ui->contactNameMemo->text().trimmed()) &&
                 (p.getPartnerAddress() == c.second.getAddress()) &&
                 (c.second.isOutgoing() == true))
-               
             {
 
                 QStandardItem *Items = new QStandardItem(c.second.toChatLine());
@@ -106,11 +107,8 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
                 Items->setData(OUTGOING, Qt::UserRole + 1);
                 chat->appendRow(Items);
                 ui->listChat->setModel(chat);
-            
        
-            }
-            else
-            {
+            } else {
                 ui->listChat->setModel(chat);
             }
 
@@ -129,10 +127,7 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
                 ui->emojiButton->setEnabled(true);
                 ui->sendChatButton->setEnabled(true);
                
-            }
-            else
-            {
-
+            } else {
                 ui->listChat->setModel(chat);
             }
         }
diff --git a/src/Model/ChatItem.cpp b/src/Model/ChatItem.cpp
index 6f219c7..b381752 100644
--- a/src/Model/ChatItem.cpp
+++ b/src/Model/ChatItem.cpp
@@ -163,22 +163,15 @@ QString ChatItem::toChatLine()
     QString moneyTextRequest;
     myDateTime.setTime_t(_timestamp);
 
-    if (_notarize == true)
-
-    {
-
+    if (_notarize == true) {
         lock = "<b> <img src=':/icons/res/lock_orange.png'><b>";
+    } else {
+        lock = "<b> <img src=':/icons/res/unlocked.png'><b>";
+    }
 
-    }else{
-        
-         lock = "<b> <img src=':/icons/res/unlocked.png'><b>";
-        }
-        if ((_confirmations > 0) && (_notarize == false))
-        
-        {
-
+    if ((_confirmations > 0) && (_notarize == false)) {
         lock = "<b> <img src=':/icons/res/lock_green.png'><b>";
-        }else{}
+    }
 
     if (_memo.startsWith("Money transaction of :"))
     {
@@ -210,8 +203,6 @@ QString ChatItem::toChatLine()
     }else{moneyTextRequest = "";
     moneyTextRequest = "";    }
 
-    
-    
 
     QString line = QString("<small>") + myDateTime.toString("yyyy-MM-dd hh:mm");
     line += QString(lock) + QString(moneyText) + QString(moneyTextRequest) +  QString("</small>");
@@ -223,16 +214,16 @@ QString ChatItem::toChatLine()
 json ChatItem::toJson()
 {
     json j;
-    j["_timestamp"] = _timestamp;
-    j["_address"] = _address.toStdString();
-    j["_contact"] = _contact.toStdString();
-    j["_memo"] = _memo.toStdString();
-    j["_requestZaddr"] = _requestZaddr.toStdString();
-    j["_type"] = _type.toStdString();
-    j["_cid"] = _cid.toStdString();
-    j["_txid"] = _txid.toStdString();
+    j["_timestamp"]     = _timestamp;
+    j["_address"]       = _address.toStdString();
+    j["_contact"]       = _contact.toStdString();
+    j["_memo"]          = _memo.toStdString();
+    j["_requestZaddr"]  = _requestZaddr.toStdString();
+    j["_type"]          = _type.toStdString();
+    j["_cid"]           = _cid.toStdString();
+    j["_txid"]          = _txid.toStdString();
     j["_confirmations"] = _confirmations;
-    j["_outgoing"] = _outgoing;
+    j["_outgoing"]      = _outgoing;
     return j;
 }