diff --git a/router-daemon/pvcrd.service b/router-daemon/pvcrd.service
index d467e543..ead18fc5 100644
--- a/router-daemon/pvcrd.service
+++ b/router-daemon/pvcrd.service
@@ -7,7 +7,7 @@ After = network-online.target frr.service
 Type = simple
 WorkingDirectory = /usr/share/pvc
 Environment = PYTHONUNBUFFERED=true
-Environment = PVCND_CONFIG_FILE=/etc/pvc/pvcrd.conf
+Environment = PVCRD_CONFIG_FILE=/etc/pvc/pvcrd.conf
 ExecStart = /usr/share/pvc/pvcrd.py
 Restart = on-failure
 
diff --git a/router-daemon/pvcrd/VXNetworkInstance.py b/router-daemon/pvcrd/VXNetworkInstance.py
index aa6597ad..44b4fe4a 100644
--- a/router-daemon/pvcrd/VXNetworkInstance.py
+++ b/router-daemon/pvcrd/VXNetworkInstance.py
@@ -89,17 +89,19 @@ class VXNetworkInstance():
         self.corosync_provisioned = True
         ansiiprint.echo('Creating Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
         os.system(
-            'echo \"
+            """
+            echo "
                 configure
                     primitive vnivip_{0} ocf:heartbeat:IPaddr2 params ip={1} cidr_netmask={2} nic={3} op monitor interval=1s
                     commit
                     up
                 resource
                     start vnivip_{0}
-            \" | crm -f -'.format(
+            " | crm -f -
+            """.format(
                 self.description,
                 self.ip_gateway,
-                self.ip_cidrnetmask
+                self.ip_cidrnetmask,
                 self.bridge_nic
             )
         )
@@ -107,14 +109,16 @@ class VXNetworkInstance():
     def removeCorosyncResource(self):
         ansiiprint.echo('Removing Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
         os.system(
-            'echo \"
+            """
+            echo "
                 resource
                     stop vnivip_{0}
                     up
                 configure
                     delete vnivip_{0}
                     commit
-            \" | crm -f -'.format(
+            " | crm -f -
+            """.format(
                 self.description
             )
         )
@@ -136,7 +140,7 @@ class VXNetworkInstance():
         )
         os.system(
             'brctl addif {0} {1}'.format(
-                self.bridge_nic
+                self.bridge_nic,
                 self.vxlan_nic
             )
         )