diff --git a/.prettierrc.js b/.prettierrc.js
index 50f8192..18d7aa7 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,3 +1,5 @@
+// Must be included inside .stylintrc, otherwise will conflict and cause weird
+// linting errors
 module.exports = {
   printWidth: 120
 };
diff --git a/.stylintrc b/.stylintrc
index 895960a..c623d6a 100644
--- a/.stylintrc
+++ b/.stylintrc
@@ -31,5 +31,6 @@
     "universal": "never",
     "valid": true,
     "zeroUnits": "never",
-    "zIndexNormalize": false
+    "zIndexNormalize": false,
+    "printWidth": 120
 }
diff --git a/oldquasar.babelrc-old b/oldquasar.babelrc-old
deleted file mode 100644
index 6bba5f0..0000000
--- a/oldquasar.babelrc-old
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "modules": false,
-        "loose": false,
-        "useBuiltIns": "usage"
-      }
-    ],
-    [
-      "@babel/preset-stage-2",
-      {
-        "modules": false,
-        "loose": false,
-        "useBuiltIns": true,
-        "decoratorsLegacy": true
-      }
-    ]
-  ],
-  "plugins": [
-    [
-      "@babel/transform-runtime",
-      {
-        "polyfill": false,
-        "regenerator": false
-      }
-    ]
-  ],
-  "comments": false
-}
diff --git a/src-electron/main-process/modules/daemon.js b/src-electron/main-process/modules/daemon.js
index aa4978a..b563d1a 100644
--- a/src-electron/main-process/modules/daemon.js
+++ b/src-electron/main-process/modules/daemon.js
@@ -419,8 +419,6 @@ export class Daemon {
     });
   }
 
-  // Get the latest service node data, used to do it in background
-  // so no user feedback required
   updateServiceNodes() {
     const service_nodes = {
       fetching: true
diff --git a/src/components/service_node/service_node_contribute.vue b/src/components/service_node/service_node_contribute.vue
index 2cbfbec..e55dfd1 100644
--- a/src/components/service_node/service_node_contribute.vue
+++ b/src/components/service_node/service_node_contribute.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="service-node-stake-tab">
     <div class="q-pa-md">
-      <!-- use placeholder with the i18n here -->
-
       <div class="row align-items sn-contribution-info">
         <div class="col-md-8">
           <div class="header">{{ $t("titles.availableForContribution") }}</div>
@@ -66,13 +64,12 @@ export default {
       this.scrollToTop();
       const key = node.service_node_pubkey;
       const minContribution = node.minContribution;
-      // close the popup if it's open
+      // close the detail popup if it's open
       this.$refs.serviceNodeDetailsContribute.isVisible = false;
       this.$emit("contribute", key, minContribution);
       this.$q.notify({
         type: "positive",
         timeout: 1000,
-        // translate
         message: this.$t("notification.positive.serviceNodeInfoFilled")
       });
     },
diff --git a/src/components/service_node/service_node_staking.vue b/src/components/service_node/service_node_staking.vue
index f2097aa..d74ea5a 100644
--- a/src/components/service_node/service_node_staking.vue
+++ b/src/components/service_node/service_node_staking.vue
@@ -49,7 +49,7 @@
     </div>
     <ServiceNodeContribute class="contribute" @contribute="fillStakingFields" />
     <q-inner-loading :showing="stake_status.sending || tx_status.sending" :dark="theme == 'dark'">
-      <q-spinner color="red" size="30" />
+      <q-spinner color="primary" size="30" />
     </q-inner-loading>
   </div>
 </template>
diff --git a/src/components/service_node/service_node_unlock.vue b/src/components/service_node/service_node_unlock.vue
index 282f402..598906a 100644
--- a/src/components/service_node/service_node_unlock.vue
+++ b/src/components/service_node/service_node_unlock.vue
@@ -48,10 +48,6 @@ export default {
       menuItems
     };
   },
-  created() {
-    const showing = this.unlock_status.sending || this.fetching;
-    console.log("is the fetching bar showing?" + showing);
-  },
   computed: mapState({
     theme: state => state.gateway.app.config.appearance.theme,
     unlock_status: state => state.gateway.service_node_status.unlock,