diff --git a/steps/aggregate-repo.sh b/steps/aggregate-repo.sh
index 6a7dee91..70883a2b 100755
--- a/steps/aggregate-repo.sh
+++ b/steps/aggregate-repo.sh
@@ -47,10 +47,10 @@ find "${dir}" -name '*.m' | while read -r m; do
     csv=${ddir}/all.csv
     mkdir -p "$(dirname "${csv}")"
     java=$(echo "${m}" | sed "s|${dir}||" | sed "s|\.m$||")
-    printf "${java}" >> "${csv}"
+    printf '%s' "${java}" >> "${csv}"
     for a in ${all}; do
         if [ -e "${m}.${a}" ]; then
-            printf ",$(cat "${m}.${a}")" >> "${csv}"
+            printf ",%s" "$(cat "${m}.${a}")" >> "${csv}"
         else
             printf ',-' >> "${csv}"
         fi
diff --git a/steps/discover-repos.rb b/steps/discover-repos.rb
index 71db7c4b..88408315 100755
--- a/steps/discover-repos.rb
+++ b/steps/discover-repos.rb
@@ -87,7 +87,7 @@
   end
   puts "Found #{json[:items].count} repositories in page #{page}"
   break if found.count >= opts[:total]
-  puts "Let\'s sleep for a few seconds to cool off GitHub API (already found #{found.count} repos)..."
+  puts "Let's sleep for a few seconds to cool off GitHub API (already found #{found.count} repos)..."
   sleep 10
   page += 1
 end
@@ -112,7 +112,7 @@
 
 path = File.expand_path(opts[:csv])
 FileUtils.mkdir_p(File.dirname(path))
-File.write(path,
-  ([found.first[1].keys.join(',')] + found.values.map { |m| m.values.join(',') }).join("\n")
-)
+lines = [found.first[1].keys.join(',')] + found.values.map { |m| m.values.join(',') }
+lines << ''
+File.write(path, lines.join("\n"))
 puts "The list of #{found.count} repos saved into #{path}"
diff --git a/steps/jpeek-repo.sh b/steps/jpeek-repo.sh
index d3d3729a..a62f51b5 100755
--- a/steps/jpeek-repo.sh
+++ b/steps/jpeek-repo.sh
@@ -132,4 +132,4 @@ done
 
 echo "Analyzed ${repo} through jPeek (${pos}/${total}), \
 $(wc -l < "${files}" | xargs) files, \
-sum is $(awk '{ sum += $1 } END { print sum }' ${values} | xargs)$("${LOCAL}/help/tdiff.sh" "${start}")"
+sum is $(awk '{ sum += $1 } END { print sum }' "${values}" | xargs)$("${LOCAL}/help/tdiff.sh" "${start}")"
diff --git a/steps/measure.sh b/steps/measure.sh
index d81390ff..447e9229 100755
--- a/steps/measure.sh
+++ b/steps/measure.sh
@@ -46,7 +46,7 @@ echo "${javas}" | while read -r java; do
         echo "Metrics already exist for $(basename "${java}") (${file}/${total})"
         continue
     fi
-    printf "%s %s %s %s %s\n" ${sh@Q} "${java@Q}" "${javam@Q}" "${file@Q}" "${total@Q}" >> "${jobs}"
+    printf "%s %s %s %s %s\n" "${sh@Q}" "${java@Q}" "${javam@Q}" "${file@Q}" "${total@Q}" >> "${jobs}"
 done
 
 "${LOCAL}/help/parallel.sh" "${jobs}"
diff --git a/steps/polish.sh b/steps/polish.sh
index e2187890..d894973d 100755
--- a/steps/polish.sh
+++ b/steps/polish.sh
@@ -39,7 +39,7 @@ echo "${repos}" | while read -r repo; do
         echo "Directory of ${repo} is obsolete and was deleted"
     fi
 done
-echo "All $(echo ${repos} | wc -l | xargs) repo directories inside ${dir} look good"
+echo "All $(echo "${repos}" | wc -l | xargs) repo directories inside ${dir} look good"
 
 orgs=$(find "${dir}" -maxdepth 1 -mindepth 1 -type d -exec realpath --relative-to="${dir}" {} \;)
 echo "${orgs}" | while read -r org; do
@@ -48,5 +48,5 @@ echo "${orgs}" | while read -r org; do
         echo "Organization ${org} is empty and was deleted"
     fi
 done
-echo "All $(echo ${orgs} | wc -l | xargs) org directories inside ${dir} look good"
+echo "All $(echo "${orgs}" | wc -l | xargs) org directories inside ${dir} look good"
 
diff --git a/tests/steps/test-aggregate.sh b/tests/steps/test-aggregate.sh
index c185be4a..91d95d99 100755
--- a/tests/steps/test-aggregate.sh
+++ b/tests/steps/test-aggregate.sh
@@ -22,7 +22,6 @@
 # SOFTWARE.
 set -e
 set -o pipefail
-set -x
 
 temp=$1
 
diff --git a/tests/steps/test-discover-repos.sh b/tests/steps/test-discover-repos.sh
index 500179f8..1242cea5 100755
--- a/tests/steps/test-discover-repos.sh
+++ b/tests/steps/test-discover-repos.sh
@@ -32,5 +32,5 @@ echo "${stdout}" | grep "Found 3 repositories in page 0" >/dev/null
 echo "${stdout}" | grep "Found 3 total repositories in GitHub" >/dev/null
 test -e "${csv}"
 test -e "${tex}"
-test $(wc -l < "${csv}" | xargs) = '3'
+test $(wc -l < "${csv}" | xargs) = '4'
 echo "👍🏻 A few repositories discovered correctly"
diff --git a/tests/steps/test-discover.sh b/tests/steps/test-discover.sh
index d47b5b68..fd8bdb50 100755
--- a/tests/steps/test-discover.sh
+++ b/tests/steps/test-discover.sh
@@ -30,11 +30,11 @@ rm -f "${csv}"
 TOTAL=3 "${LOCAL}/steps/discover.sh" >/dev/null
 test -e "${csv}"
 test -e "${TARGET}/temp/repo-details.tex"
-test $(wc -l < "${csv}" | xargs) = '3'
+test $(wc -l < "${csv}" | xargs) = '4'
 echo "👍🏻 A few repositories discovered correctly"
 
 rm -f "${csv}"
 REPO=yegor256/jaxec "${LOCAL}/steps/discover.sh" >/dev/null
 test -e "${csv}"
-test $(wc -l < "${csv}" | xargs) = '1'
+test $(wc -l < "${csv}" | xargs) = '2'
 echo "👍🏻 A single repository discovered correctly"