diff --git a/bin/hafas-m b/bin/hafas-m
index 97ecaa244dd6009f53e73d59190453444878d23e..5476cb5c11b5580dfba4d1b19110c1bc5d9f53e1 100755
--- a/bin/hafas-m
+++ b/bin/hafas-m
@@ -85,10 +85,9 @@ sub show_version {
 sub parse_mot_options {
 
 	my $default_yes = 1;
-	my $help;
 
 	for my $type ( split( qr{,}, $types ) ) {
-		if ( $type eq 'help' or $type eq 'list' or $type eq '?' ) {
+		if ( $type eq 'help' or $type eq 'list' or $type eq q{?} ) {
 			if ( not $hafas_url ) {
 				$service //= 'DB';
 			}
@@ -113,6 +112,7 @@ sub parse_mot_options {
 			push( @exclusive_mots, $type );
 		}
 	}
+	return;
 }
 
 sub show_similar_stops {
@@ -123,6 +123,7 @@ sub show_similar_stops {
 			printf( "%s (%s)\n", $c->{name}, $c->{id} );
 		}
 	}
+	return;
 }
 
 sub display_result {
diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index 28d069b11310f989ac6212055dcc49fe32e9439d..979a5382acc2c18e3c0dd7d600af9255971ecb6c 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -5,7 +5,7 @@ use warnings;
 use 5.010;
 use utf8;
 
-no if $] >= 5.018, warnings => "experimental::smartmatch";
+no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 use Carp qw(confess);
 use LWP::UserAgent;
@@ -214,6 +214,7 @@ sub set_productfilter {
 		}
 	}
 
+	return;
 }
 
 sub check_input_error {