diff --git a/scripts/makefile b/scripts/makefile
index dafd2be..2847e1e 100644
--- a/scripts/makefile
+++ b/scripts/makefile
@@ -1,5 +1,18 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
+# Copyright 2017-2022 Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # -----------------------------------------------------------------------
 
 null 	    :=#
diff --git a/scripts/which_deployment_owns_device.sh b/scripts/which_deployment_owns_device.sh
index c23961d..55b7a6f 100755
--- a/scripts/which_deployment_owns_device.sh
+++ b/scripts/which_deployment_owns_device.sh
@@ -20,9 +20,9 @@
 for DEPLOY in $(kubectl -n voltha get deploy -o 'jsonpath={.items[*].metadata.name}'); do
     if [[ "$DEPLOY" =~ voltha-rw-core-.* ]]; then
         FOUND=$(kubectl -n voltha logs "deploy/$DEPLOY" 2>/dev/null | grep "$DEVICE_ID" | grep -i ownedbyme | tail -1)
-        if [ ! -z "$FOUND" ]; then
+        if [ -n "$FOUND" ]; then
             OWNED=$(echo "$FOUND" | grep '"owned":true')
-            if [ ! -z "$OWNED" ]; then
+            if [ -n "$OWNED" ]; then
                 CUR_DATE=$(echo "$OWNED" | jq -r .ts)
                 CUR_DEPLOY=$DEPLOY
                 if [ -z "$BEST_DEPLOY" ]; then