diff --git a/src/scripts/detect-secrets-dir.sh b/src/scripts/detect-secrets-dir.sh
index 24404d3..0377fdf 100644
--- a/src/scripts/detect-secrets-dir.sh
+++ b/src/scripts/detect-secrets-dir.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo "Starting the directory scan at path '$PARAM_STR_SOURCE'"
-echo "Using exported Gitleaks args '$GITLEAKS_ARGS'"
 
+set -x
 eval gitleaks dir "$GITLEAKS_ARGS" "$PARAM_STR_SOURCE"
+set +x
diff --git a/src/scripts/detect-secrets-git.sh b/src/scripts/detect-secrets-git.sh
index e5afd08..aea8a5b 100644
--- a/src/scripts/detect-secrets-git.sh
+++ b/src/scripts/detect-secrets-git.sh
@@ -2,8 +2,6 @@
 
 EVAL_GITLEAKS_ARGS=$(eval echo "${GITLEAKS_ARGS}")
 
-echo "Starting the repository scan at path '$PARAM_STR_SOURCE'"
-echo "Using exported Gitleaks args '$GITLEAKS_ARGS'"
 echo "Using '$GIT_BASE_BRANCH' as the base branch"
 echo "Using '$GIT_CURRENT_BRANCH' as the current branch"
 
@@ -11,13 +9,11 @@ if [[ "$GIT_BASE_BRANCH" = "$GIT_CURRENT_BRANCH" ]]; then
   # Usually when changes are merged back into a long-lived branch, e.g. trunk
   LOG_OPTS="$PARAM_STR_BASE_REVISION^..$CIRCLE_SHA1"
 
-  echo "The base branch is the current branch"
-
   if [[ -z "$PARAM_STR_BASE_REVISION" ]] || ! git cat-file -e "$PARAM_STR_BASE_REVISION"; then
     LOG_OPTS="HEAD~1^..$CIRCLE_SHA1"
 
     echo "The base revision is empty or invalid"
-    echo "Using HEAD~1 as the base revision"
+    echo "Scanning using 'HEAD~1' as the base revision"
 
   elif [[ "$PARAM_STR_BASE_REVISION" == "$CIRCLE_SHA1" ]]; then
     LOG_OPTS=-1
@@ -25,13 +21,15 @@ if [[ "$GIT_BASE_BRANCH" = "$GIT_CURRENT_BRANCH" ]]; then
     echo "The base revision is the current revision"
     echo "Scanning only last commit"
 
+  else
+    echo "Scanning using the provided base revision '$PARAM_STR_BASE_REVISION'"
+
   fi
 
   EVAL_GITLEAKS_ARGS="$GITLEAKS_ARGS --log-opts=$LOG_OPTS"
 
 else
   # Usually a short lived branch, that is a pull request
-  echo "The base branch is not the current branch"
   echo "Scanning all the commits in the current branch '$GIT_CURRENT_BRANCH'"
 
   EVAL_GITLEAKS_ARGS="$GITLEAKS_ARGS --log-opts=$GIT_BASE_BRANCH..$GIT_CURRENT_BRANCH"