diff --git a/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java b/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java
index 60a09f422..ec6e55d18 100644
--- a/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java
+++ b/lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java
@@ -151,7 +151,7 @@ protected boolean stopProcedure() {
         try {
             bgpNettyGroups.close();
         } catch (Exception e) {
-            LOG.warn("Failed to stop BGP dispatcher", e);
+            LOG.warn("Failed to stop BGP Netty groups", e);
             closeSuccess = false;
         }
         try {
diff --git a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java
index 4848d10f8..f2c65473d 100644
--- a/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java
+++ b/lighty-modules/lighty-netconf-sb/src/main/java/io/lighty/modules/southbound/netconf/impl/NetconfTopologyPlugin.java
@@ -55,10 +55,8 @@ protected boolean initProcedure() {
                 lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(),
                 lightyServices.getClusterSingletonServiceProvider(), encryptionService);
         final NetconfClientFactory netconfFactory = new NetconfClientFactoryImpl(new DefaultNetconfTimer());
-        final CredentialProvider credentialProvider
-            = new DefaultCredentialProvider(service);
-        final SslContextFactoryProvider factoryProvider
-            = new DefaultSslContextFactoryProvider(service);
+        final CredentialProvider credentialProvider = new DefaultCredentialProvider(service);
+        final SslContextFactoryProvider factoryProvider = new DefaultSslContextFactoryProvider(service);
         final NetconfClientConfigurationBuilderFactory factory = new NetconfClientConfigurationBuilderFactoryImpl(
             encryptionService, credentialProvider, factoryProvider);
         final NetconfTopologySchemaAssembler assembler = new NetconfTopologySchemaAssembler(1,1,10, TimeUnit.SECONDS);