diff --git a/lib/Directory/Simplify/File.pm b/lib/Directory/Simplify/File.pm
index ea8d24a..2c4f492 100644
--- a/lib/Directory/Simplify/File.pm
+++ b/lib/Directory/Simplify/File.pm
@@ -15,7 +15,7 @@ sub new {
     (@{$self}{qw/ dev ino mode nlink uid gid rdev size
                 atime mtime ctime blksize blocks /})
         = lstat $self->{name};
-    $self
+    return $self;
 }
 
 sub hash {
@@ -26,7 +26,7 @@ sub hash {
         $ctx->addfile($self->{name});
         $self->{_hash} = $ctx->hexdigest;
     }
-    $self->{_hash}
+    return $self->{_hash};
 }
 
 1;
diff --git a/lib/Directory/Simplify/FileHash.pm b/lib/Directory/Simplify/FileHash.pm
index 51bde63..a45ec4b 100644
--- a/lib/Directory/Simplify/FileHash.pm
+++ b/lib/Directory/Simplify/FileHash.pm
@@ -47,11 +47,12 @@ sub add {
         }
         $self->{_files_in_hash}->{$file->{name}} = 1;
     }
+    return;
 }
 
 sub entries {
     my $self = shift;
-    values %{$self->{_entries}}
+    return values %{$self->{_entries}};
 }
 
 1;
diff --git a/lib/Directory/Simplify/Instruction/CopyTimestamp.pm b/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
index e808409..88cb3de 100644
--- a/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
+++ b/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
@@ -19,6 +19,7 @@ sub run {
     my $self = shift;
     # preserve older time stamp
     utime $self->{source}->{atime}, $self->{source}->{mtime}, $self->{target}->{name};
+    return;
 }
 
 sub bytes_freed {
diff --git a/lib/Directory/Simplify/Instruction/Generator.pm b/lib/Directory/Simplify/Instruction/Generator.pm
index 204aad4..98d6c86 100644
--- a/lib/Directory/Simplify/Instruction/Generator.pm
+++ b/lib/Directory/Simplify/Instruction/Generator.pm
@@ -21,7 +21,7 @@ sub new {
 
 sub as_string {
     my $self = shift;
-    join "\n", $self->instructions;
+    return join "\n", $self->instructions;
 }
 
 sub buckets {
@@ -55,7 +55,7 @@ sub buckets {
         push @buckets, @these_buckets;
     }
 
-    @buckets
+    return @buckets;
 }
 
 sub _entry_should_be_skipped {
@@ -176,7 +176,7 @@ sub instructions {
             );
         }
     }
-    @inst
+    return @inst;
 }
 
 1;
diff --git a/lib/Directory/Simplify/Instruction/Hardlink.pm b/lib/Directory/Simplify/Instruction/Hardlink.pm
index cce7565..a039f49 100644
--- a/lib/Directory/Simplify/Instruction/Hardlink.pm
+++ b/lib/Directory/Simplify/Instruction/Hardlink.pm
@@ -31,6 +31,7 @@ sub run {
     if (--$self->{target}->{nlink} == 0) {
         $self->{freed} = $self->{target}->{size};
     }
+    return;
 }
 
 sub bytes_freed {
diff --git a/lib/Directory/Simplify/Utils.pm b/lib/Directory/Simplify/Utils.pm
index d0fe408..f4adc25 100644
--- a/lib/Directory/Simplify/Utils.pm
+++ b/lib/Directory/Simplify/Utils.pm
@@ -13,7 +13,7 @@ sub addcommas {
         }
         push @added, (join '.', @parts);
     }
-    wantarray ? @added : $added[0]
+    return wantarray ? @added : $added[0];
 }
 
 sub hr_size {
@@ -32,7 +32,7 @@ sub hr_size {
     # default to ($sz, 'bytes')
     @ret = ($sz, $sizes[0]) unless @ret;
 
-    wantarray ? @ret : "@ret"
+    return wantarray ? @ret : "@ret";
 }
 
 sub shell_quote {
@@ -43,7 +43,7 @@ sub shell_quote {
             =~ s/'/'\\''/g;
         "'$out'";
     } @words;
-    wantarray ? @transformed : $transformed[0];
+    return wantarray ? @transformed : $transformed[0];
 }
 
 1;
diff --git a/simplify_static_dir-main.pl b/simplify_static_dir-main.pl
index 41a2e04..6b5577f 100755
--- a/simplify_static_dir-main.pl
+++ b/simplify_static_dir-main.pl
@@ -121,6 +121,7 @@ sub HELP_MESSAGE {
         -verbose => 1,
         -exitval => 0,
     );
+    return;
 }
 
 MAIN: {
diff --git a/t/freed-bytes-commas.t b/t/freed-bytes-commas.t
index 7ffdeb8..27dafa6 100644
--- a/t/freed-bytes-commas.t
+++ b/t/freed-bytes-commas.t
@@ -26,4 +26,5 @@ sub put_file {
             print $fh 'A';
         }
     }
+    return;
 }
diff --git a/t/normal-linkage.t b/t/normal-linkage.t
index 9c25b82..3eecb92 100644
--- a/t/normal-linkage.t
+++ b/t/normal-linkage.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;