diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp
index d0e2f0e..7843d10 100644
--- a/src/balancestablemodel.cpp
+++ b/src/balancestablemodel.cpp
@@ -3,9 +3,8 @@
 #include "settings.h"
 #include "camount.h"
 
-BalancesTableModel::BalancesTableModel(QObject *parent)
-    : QAbstractTableModel(parent) {    
-}
+BalancesTableModel::BalancesTableModel(QObject *parent): QAbstractTableModel(parent) 
+{}
 
 void BalancesTableModel::setNewData(const QList<QString> zaddrs, const QList<QString> taddrs,
     const QMap<QString, CAmount> balances, const QList<UnspentOutput> outputs)
@@ -29,21 +28,19 @@ void BalancesTableModel::setNewData(const QList<QString> zaddrs, const QList<QSt
     modeldata = new QList<std::tuple<QString, CAmount>>();
     std::for_each(balances.keyBegin(), balances.keyEnd(), [=, &anyz, &anyt] (auto keyIt) {
         modeldata->push_back(std::make_tuple(keyIt, balances.value(keyIt)));
-         if (Settings::isZAddress(keyIt)) {
+        if (Settings::isZAddress(keyIt))
             anyz = true;
-        } else if (Settings::isTAddress(keyIt)) {
+
+        else if (Settings::isTAddress(keyIt))
             anyt = true;
-        }
     });
 
     // Add all addresses that have no balances, if there are no existing addresses
-    if (!anyz && zaddrs.length() > 0) {
+    if (!anyz && zaddrs.length() > 0) 
         modeldata->push_back(std::make_tuple(zaddrs[0], CAmount::fromqint64(0)));
-    }
 
-   if (!anyt && taddrs.length() > 0) {
+    if (!anyt && taddrs.length() > 0)
         modeldata->push_back(std::make_tuple(taddrs[0], CAmount::fromqint64(0)));
-    }
 
     // And then update the data
     dataChanged(index(0, 0), index(modeldata->size()-1, columnCount(index(0,0))-1));
@@ -53,19 +50,17 @@ void BalancesTableModel::setNewData(const QList<QString> zaddrs, const QList<QSt
         layoutChanged();
 }
 
-BalancesTableModel::~BalancesTableModel() {
+BalancesTableModel::~BalancesTableModel()
+{
     delete modeldata;
     delete unspentOutputs;
 }
 
 int BalancesTableModel::rowCount(const QModelIndex&) const
 {
-    if (modeldata == nullptr) {
-        if (loading) 
-            return 1;
-        else 
-            return 0;
-    }
+    if (modeldata == nullptr)
+        return (loading) ? 1: 0;
+
     return modeldata->size();
 }
 
@@ -76,25 +71,31 @@ int BalancesTableModel::columnCount(const QModelIndex&) const
 
 QVariant BalancesTableModel::data(const QModelIndex &index, int role) const
 {
-    if (loading) {
-        if (role == Qt::DisplayRole) 
+    if (loading) 
+        return (role == Qt::DisplayRole) ? "Loading..." : QVariant();
+        /*if (role == Qt::DisplayRole) 
             return "Loading...";
         else
-            return QVariant();
-    }
+            return QVariant();*/
 
-    if (role == Qt::TextAlignmentRole && index.column() == 1) return QVariant(Qt::AlignRight | Qt::AlignVCenter);
+    if (role == Qt::TextAlignmentRole && index.column() == 1) 
+        return QVariant(Qt::AlignRight | Qt::AlignVCenter);
     
     if (role == Qt::ForegroundRole) {
         // If any of the UTXOs for this address has zero confirmations, paint it in red
         const auto& addr = std::get<0>(modeldata->at(index.row()));
-        for (auto unconfirmedOutput : *unspentOutputs) {
-            if (unconfirmedOutput.address == addr && 
-                    (!unconfirmedOutput.spendable || unconfirmedOutput.pending)) {
+        for (auto unconfirmedOutput : *unspentOutputs)
+        {
+            if (
+                unconfirmedOutput.address == addr && 
+                (!unconfirmedOutput.spendable || unconfirmedOutput.pending)
+            ) 
+            {
                 QBrush b;
                 b.setColor(Qt::red);
                 return b;
             }
+
         }
 
         // Else, just return the default brush
@@ -103,17 +104,21 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const
         return b;    
     }
     
-    if (role == Qt::DisplayRole) {
-        switch (index.column()) {
-        case 0: return AddressBook::addLabelToAddress(std::get<0>(modeldata->at(index.row())));
-        case 1: return std::get<1>(modeldata->at(index.row())).toDecimalhushString();
+    if (role == Qt::DisplayRole) 
+    {
+        switch (index.column()) 
+        {
+            case 0: return AddressBook::addLabelToAddress(std::get<0>(modeldata->at(index.row())));
+            case 1: return std::get<1>(modeldata->at(index.row())).toDecimalhushString();
         }
     }
 
-    if(role == Qt::ToolTipRole) {
-        switch (index.column()) {
-        case 0: return AddressBook::addLabelToAddress(std::get<0>(modeldata->at(index.row())));
-        case 1: return std::get<1>(modeldata->at(index.row())).toDecimalhushString();
+    if(role == Qt::ToolTipRole) 
+    {
+        switch (index.column()) 
+        {
+            case 0: return AddressBook::addLabelToAddress(std::get<0>(modeldata->at(index.row())));
+            case 1: return std::get<1>(modeldata->at(index.row())).toDecimalhushString();
         }
     }
     
@@ -123,11 +128,13 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const
 
 QVariant BalancesTableModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (role == Qt::TextAlignmentRole && section == 1) {
+    if (role == Qt::TextAlignmentRole && section == 1) 
+    {
         return QVariant(Qt::AlignRight | Qt::AlignVCenter);
     }
 
-    if (role == Qt::FontRole) {
+    if (role == Qt::FontRole) 
+    {
         QFont f;
         f.setBold(true);
         return f;
@@ -136,13 +143,16 @@ QVariant BalancesTableModel::headerData(int section, Qt::Orientation orientation
     if (role != Qt::DisplayRole)
         return QVariant();
 
-    if (orientation == Qt::Horizontal) {
-        switch (section) {
-        case 0:                 return tr("Address");
-        case 1:                 return tr("Amount");
-        default:                return QVariant();
+    if (orientation == Qt::Horizontal) 
+    {
+        switch (section) 
+        {
+            case 0:  return tr("Address");
+            case 1:  return tr("Amount");
+            default: return QVariant();
         }
     }
+    
     return QVariant();
 }