diff --git a/manifests/osm_clientservice.yaml b/manifests/osm_clientservice.yaml
index bf536e2fdf6448943fa9727e24c722ca18932759..ef9eaa2f82d48a35ed6f64be6edb7f3faf50d11d 100644
--- a/manifests/osm_clientservice.yaml
+++ b/manifests/osm_clientservice.yaml
@@ -71,5 +71,4 @@ spec:
     - name: metrics
       protocol: TCP
       port: 9192
-      targetPort: 
----
\ No newline at end of file
+      targetPort: 9192
diff --git a/src/osm_client/Config.py b/src/osm_client/Config.py
index 84feff3d97e1d9d42b6b1e0f58814c116e9536b4..d34980c43378e274c965c10d9d7dbf6a6a468485 100644
--- a/src/osm_client/Config.py
+++ b/src/osm_client/Config.py
@@ -15,6 +15,4 @@
 from common.Settings import get_setting
 
 DEFAULT_OSM_ADDRESS = '127.0.0.1'
-OSM_ADDRESS = get_setting('OSM_ADDRESS', DEFAULT_OSM_ADDRESS)
- 
- 
\ No newline at end of file
+OSM_ADDRESS = get_setting('OSM_ADDRESS', default=DEFAULT_OSM_ADDRESS)
diff --git a/src/osm_client/client/OsmClient.py b/src/osm_client/client/OsmClient.py
index 239e2a2fbe5f6e7fb922cb0476de1eda6929b508..2ef7a414e39cd3063034eecbbe23b44db8e0204e 100644
--- a/src/osm_client/client/OsmClient.py
+++ b/src/osm_client/client/OsmClient.py
@@ -16,6 +16,7 @@ import grpc, logging
 from common.Constants import ServiceNameEnum
 from common.Settings import get_service_host, get_service_port_grpc
 from common.proto.osm_client_pb2_grpc import OsmServiceStub
+from common.proto.osm_client_pb2 import CreateRequest, CreateResponse, NsiListResponse, GetRequest, GetResponse, DeleteRequest, DeleteResponse
 from common.proto.context_pb2 import (Empty)
 from common.tools.client.RetryDecorator import retry, delay_exponential
 from common.tools.grpc.Tools import grpc_message_to_json_string
@@ -76,4 +77,4 @@ class OsmClient:
         LOGGER.debug('NsiDelete request: {:s}'.format(grpc_message_to_json_string(request)))
         response = self.stub.NsiDelete(request)
         LOGGER.debug('NsiDelete result: {:s}'.format(grpc_message_to_json_string(response)))
-        return response
\ No newline at end of file
+        return response
diff --git a/src/osm_client/service/OsmClientServiceServicerImpl.py b/src/osm_client/service/OsmClientServiceServicerImpl.py
index 5bbde3b8b40f1ab02bda403690d22b96980325b4..8e9bf1ea6c8d3345467e698ffbf99f7a2bbb2ce7 100644
--- a/src/osm_client/service/OsmClientServiceServicerImpl.py
+++ b/src/osm_client/service/OsmClientServiceServicerImpl.py
@@ -67,4 +67,4 @@ class OsmClientServiceServicerImpl(OsmServiceServicer):
             resp = DeleteResponse(succeded = False, errormessage = str(e))
         else:
             resp = DeleteResponse(succeded = True)
-        return resp
\ No newline at end of file
+        return resp