diff --git a/centreon-plugins/cloud/aws/custom/awscli.pm b/centreon-plugins/cloud/aws/custom/awscli.pm
index 3e43ea54b..4ed939bbe 100644
--- a/centreon-plugins/cloud/aws/custom/awscli.pm
+++ b/centreon-plugins/cloud/aws/custom/awscli.pm
@@ -23,7 +23,6 @@ package cloud::aws::custom::awscli;
 use strict;
 use warnings;
 use JSON;
-use Data::Dumper;
 use centreon::plugins::misc;
 
 sub new {
@@ -53,15 +52,10 @@ sub new {
             "sudo"              => { name => 'sudo' },
         } );
     }
-    $options{options}->add_help(
-        package  => __PACKAGE__,
-        sections => 'AWSCLI OPTIONS',
-        once     => 1
-    );
+    $options{options}->add_help(package => __PACKAGE__, sections => 'AWSCLI OPTIONS', once => 1);
 
     $self->{output} = $options{output};
     $self->{mode}   = $options{mode};
-
     return $self;
 }
 
@@ -78,8 +72,6 @@ sub set_options {
 sub set_defaults {
     my ( $self, %options ) = @_;
 
-    # options{default}
-
     # Manage default value
     foreach ( keys %{ $options{default} } ) {
         if ( $_ eq $self->{mode} ) {
@@ -96,30 +88,30 @@ sub set_defaults {
 }
 
 sub check_options {
-    my ( $self, %options ) = @_;
+    my ($self, %options) = @_;
     return 0;
 }
 
 sub execReq {
-    my ( $self, $options ) = @_;
+    my ($self, $options) = @_;
     my $jsoncontent;
 
-    if ( !defined( $options->{output} ) ) {
+    if (!defined($options->{output})) {
         $options->{output} = 'json';
     }
 
     my $json = JSON->new;
     my $json_encoded = $options->{command} . " " . $options->{subcommand};
-    if ( defined( $self->{option_results}->{region} ) ) {
+    if (defined($self->{option_results}->{region})) {
         $json_encoded = $json_encoded . " --region '". $self->{option_results}->{region} . "'";
     }
-    if ( defined( $options->{json} ) ) {
+    if (defined($options->{json})) {
         $json_encoded = $json_encoded . " --cli-input-json '" . $json->encode( $options->{json} ) . "'";
     }
     
     $self->{option_results}->{timeout} = 30;
     
-    if ( $options->{output} eq 'text' ) {
+    if ($options->{output} eq 'text') {
         $self->{stdout} = centreon::plugins::misc::execute(
             output => $self->{output},
             options => $self->{option_results},
@@ -130,8 +122,7 @@ sub execReq {
         );
         my @return = split /\n/, $self->{stdout};
         $jsoncontent = $json->encode( [@return] );
-    }
-    else {
+    } else {
         $jsoncontent = centreon::plugins::misc::execute(
             output => $self->{output},
             options => $self->{option_results},
@@ -141,7 +132,7 @@ sub execReq {
             command_options => $json_encoded
         );
     }
-    if ( $? > 0 ) {
+    if ($? > 0) {
         $self->{output}->add_option_msg( short_msg => "Cannot run aws" );
         $self->{output}->option_exit();
     }
diff --git a/centreon-plugins/cloud/aws/mode/cloudwatch.pm b/centreon-plugins/cloud/aws/mode/cloudwatch.pm
index 43c5fef6e..a92ac3ef4 100644
--- a/centreon-plugins/cloud/aws/mode/cloudwatch.pm
+++ b/centreon-plugins/cloud/aws/mode/cloudwatch.pm
@@ -25,18 +25,17 @@ use base qw(centreon::plugins::mode);
 use strict;
 use warnings;
 use centreon::plugins::misc;
-use Data::Dumper;
 use POSIX;
 use JSON;
 use Module::Load;
 
 my $CloudwatchMetrics = {
-    'cpu'            => "cloud::aws::mode::metrics::ec2instancecpu",
-    'traffic'        => "cloud::aws::mode::metrics::ec2instancenetwork",
-    'cpucreditusage' => "cloud::aws::mode::metrics::ec2instancecpucreditusage",
-    'cpucreditbalance' => "cloud::aws::mode::metrics::ec2instancecpucreditbalance",
-    'bucketsize' => "cloud::aws::mode::metrics::s3bucketsize",
-    'rdscpu'     => "cloud::aws::mode::metrics::rdsinstancecpu",
+    cpu                => "cloud::aws::mode::metrics::ec2instancecpu",
+    traffic'           => "cloud::aws::mode::metrics::ec2instancenetwork",
+    cpucreditusage     => "cloud::aws::mode::metrics::ec2instancecpucreditusage",
+    cpucreditbalance   => "cloud::aws::mode::metrics::ec2instancecpucreditbalance",
+    bucketsize         => "cloud::aws::mode::metrics::s3bucketsize",
+    rdscpu             => "cloud::aws::mode::metrics::rdsinstancecpu",
 };
 
 my $StatisticsType = "Average,Minimum,Maximum,Sum,SampleCount";
diff --git a/centreon-plugins/cloud/aws/mode/instancestate.pm b/centreon-plugins/cloud/aws/mode/instancestate.pm
index b7304a607..966d68565 100644
--- a/centreon-plugins/cloud/aws/mode/instancestate.pm
+++ b/centreon-plugins/cloud/aws/mode/instancestate.pm
@@ -51,7 +51,7 @@ sub new {
 
     $options{options}->add_options(
         arguments => {
-            "state:s" => { name => 'state', default => 'all' },
+            "state:s"                => { name => 'state', default => 'all' },
             "no-includeallinstances" => { name => 'includeallinstances' },
             "exclude:s"              => { name => 'exclude' },
             "instanceid:s"           => { name => 'instanceid' }
@@ -62,45 +62,43 @@ sub new {
 }
 
 sub check_options {
-    my ( $self, %options ) = @_;
+    my ($self, %options) = @_;
     $self->SUPER::init(%options);
 }
 
 sub manage_selection {
-    my ( $self, %options ) = @_;
+    my ($self, %options) = @_;
     
-    my ( @result, $awsapi );
+    my (@result, $awsapi);
 
     # Getting some parameters
     # includeallinstances
-    if ( defined( $self->{option_results}->{includeallinstances} ) ) {
-        $self->{option_results}->{includeallinstances} =  JSON::false;
-    }
-    else {
+    if (defined($self->{option_results}->{includeallinstances})) {
+        $self->{option_results}->{includeallinstances} = JSON::false;
+    } else {
         $self->{option_results}->{includeallinstances} = JSON::true;
     }
 
     # states
-    if ( $self->{option_results}->{state} eq 'all' ) {
-        @{ $self->{option_results}->{statetab} } = keys(%EC2_instance_states);
-    }
-    else {
-        @{ $self->{option_results}->{statetab} } = split( /,/, $self->{option_results}->{state} );
-        foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) {
-            if ( !grep { /^$curstate$/ } keys(%EC2_instance_states) ) {
-                $self->{output}->add_option_msg( severity  => 'UNKNOWN', short_msg => "The state doesn't exist." );
+    if ($self->{option_results}->{state} eq 'all') {
+        @{$self->{option_results}->{statetab} } = keys %EC2_instance_states;
+    } else {
+        @{$self->{option_results}->{statetab}} = split /,/, $self->{option_results}->{state};
+        foreach my $curstate (@{$self->{option_results}->{statetab}}) {
+            if (!grep { /^$curstate$/ } keys(%EC2_instance_states)) {
+                $self->{output}->add_option_msg(severity  => 'UNKNOWN', short_msg => "The state doesn't exist.");
                 $self->{output}->option_exit();
             }
         }
     }
 
     # exclusions
-    if ( defined( $self->{option_results}->{exclude} ) ) {
-        my @excludetab = split( /,/, $self->{option_results}->{exclude} );
+    if (defined($self->{option_results}->{exclude})) {
+        my @excludetab = split /,/, $self->{option_results}->{exclude};
         my %array1 = map { $_ => 1 } @excludetab;
-        @{ $self->{option_results}->{statetab} } = grep { not $array1{$_} } @{ $self->{option_results}->{statetab} };
+        @{$self->{option_results}->{statetab}} = grep { not $array1{$_} } @{$self->{option_results}->{statetab}};
     }
-    my $states = join(',',@{ $self->{option_results}->{statetab} });
+    my $states = join(',',@{$self->{option_results}->{statetab}});
     
     # Getting data from AWS
     # Building JSON
@@ -114,9 +112,9 @@ sub manage_selection {
             }],
     };
     # InstanceIds
-    if ( defined( $self->{option_results}->{instanceid} ) ) {
-        my @InstanceIds = split(/,/,$self->{option_results}->{instanceid});
-        @{$apiRequest->{json}{'InstanceIds'}} = @InstanceIds;
+    if (defined($self->{option_results}->{instanceid})) {
+        my @InstanceIds = split(/,/, $self->{option_results}->{instanceid});
+        @{$apiRequest->{json}{InstanceIds}} = @InstanceIds;
     }
 
     # Requesting API
@@ -124,22 +122,22 @@ sub manage_selection {
     $self->{command_return} = $awsapi->execReq($apiRequest);
         
     # Compute data
-    $self->{option_results}->{instancecount}->{'total'} = '0';
-    foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) {
-        $self->{option_results}->{instancecount}->{$curstate} = '0';
+    $self->{option_results}->{instancecount}->{total} = 0;
+    foreach my $curstate (@{$self->{option_results}->{statetab}}) {
+        $self->{option_results}->{instancecount}->{$curstate} = 0;
     }
-    foreach my $l ( @{ $self->{command_return}->{InstanceStatuses} } ) {
-        $self->{result}->{instance}->{ $l->{InstanceId} } = $l->{InstanceState}->{Name};
+    foreach my $l (@{$self->{command_return}->{InstanceStatuses}}) {
+        $self->{result}->{instance}->{$l->{InstanceId}} = $l->{InstanceState}->{Name};
 
         # long output for each instance
-        $self->{output}->output_add( long_msg => "'" . $l->{InstanceId} . "' [state = " . $l->{InstanceState}->{Name} . ']' );
+        $self->{output}->output_add(long_msg => "'" . $l->{InstanceId} . "' [state = " . $l->{InstanceState}->{Name} . ']');
 
-        foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) {
-            if ( $l->{InstanceState}->{Name} eq $curstate ) {
+        foreach my $curstate (@{$self->{option_results}->{statetab}}) {
+            if ($l->{InstanceState}->{Name} eq $curstate) {
                 $self->{option_results}->{instancecount}->{$curstate}++;
             }
         }
-        $self->{option_results}->{instancecount}->{'total'}++;
+        $self->{option_results}->{instancecount}->{total}++;
     }
 }
 
@@ -158,16 +156,16 @@ sub run {
         value => $self->{option_results}->{instancecount}->{'total'},
     );
 
-    foreach my $curstate ( @{ $self->{option_results}->{statetab} } ) {
+    foreach my $curstate (@{$self->{option_results}->{statetab}}) {
         $self->{output}->perfdata_add(
             label => $curstate,
             value => $self->{option_results}->{instancecount}->{$curstate},
         );
 
         # Most critical state
-        if ( $self->{option_results}->{instancecount}->{$curstate} != '0' ) {
+        if ($self->{option_results}->{instancecount}->{$curstate} != 0) {
             $exit_code = $EC2_instance_states{$curstate};
-            $exit_code = $self->{output}->get_most_critical( status => [ $exit_code, $old_status ] );
+            $exit_code = $self->{output}->get_most_critical(status => [ $exit_code, $old_status ]);
             $old_status = $exit_code;
         }
     }
@@ -175,7 +173,7 @@ sub run {
     # Output message
     $self->{output}->output_add(
         severity  => $exit_code,
-        short_msg => sprintf( "Total instances: %s", $self->{option_results}->{instancecount}->{'total'} )
+        short_msg => sprintf("Total instances: %s", $self->{option_results}->{instancecount}->{total})
     );
 
     $self->{output}->display();
diff --git a/centreon-plugins/cloud/aws/mode/list.pm b/centreon-plugins/cloud/aws/mode/list.pm
index a1eb79835..38da746c7 100644
--- a/centreon-plugins/cloud/aws/mode/list.pm
+++ b/centreon-plugins/cloud/aws/mode/list.pm
@@ -51,29 +51,24 @@ sub new {
 }
 
 sub check_options {
-    my ( $self, %options ) = @_;
+    my ($self, %options) = @_;
     $self->SUPER::init(%options);
 }
 
 sub api_request {
-    my ( $self, %options ) = @_;
+    my ($self, %options) = @_;
 
-    @{ $self->{option_results}->{servicetab} } =
-      split( /,/, $self->{option_results}->{service} );
-    foreach my $service ( @{ $self->{option_results}->{servicetab} } ) {
-        $self->{result}->{count}->{$service} = '0';
-        if ( $service eq 'EC2' ) {
+    @{$self->{option_results}->{servicetab}} = split( /,/, $self->{option_results}->{service} );
+    foreach my $service (@{$self->{option_results}->{servicetab}}) {
+        $self->{result}->{count}->{$service} = 0;
+        if ($service eq 'EC2') {
             $self->EC2(%options);
-        }
-        elsif ( $service eq 'S3' ) {
+        } elsif ($service eq 'S3') {
             $self->S3(%options);
-        }
-        elsif ( $service eq 'RDS' ) {
+        } elsif ($service eq 'RDS') {
             $self->RDS(%options);
-        }
-        else {
-            $self->{output}->add_option_msg(
-                short_msg => "Service $service doesn't exists" );
+        } else {
+            $self->{output}->add_option_msg(short_msg => "Service $service doesn't exists" );
             $self->{output}->option_exit();
         }
     }
@@ -103,16 +98,16 @@ sub EC2 {
     $self->{command_return} = $awsapi->execReq($apiRequest);
 
     # Compute data
-    foreach my $instance ( @{ $self->{command_return}->{Reservations} } ) {
-        foreach my $tags ( @{ $instance->{Instances}[0]->{Tags} } ) {
-            if ( $tags->{Key} eq 'Name' ) {
+    foreach my $instance (@{$self->{command_return}->{Reservations}}) {
+        foreach my $tags (@{$instance->{Instances}[0]->{Tags}}) {
+            if ($tags->{Key} eq 'Name') {
                 $instance->{Instances}[0]->{Name} = $tags->{Value};
             }
         }
-        $self->{result}->{'EC2'}->{ $instance->{Instances}[0]->{InstanceId} } =
+        $self->{result}->{'EC2'}->{$instance->{Instances}[0]->{InstanceId}} =
           {
-            'State' => $instance->{Instances}[0]->{State}->{Name},
-            'Name'  => $instance->{Instances}[0]->{Name}
+            State => $instance->{Instances}[0]->{State}->{Name},
+            Name   => $instance->{Instances}[0]->{Name}
           };
 
         $self->{result}->{count}->{'EC2'}++;
@@ -134,16 +129,16 @@ sub S3 {
     $self->{command_return} = $awsapi->execReq($apiRequest);
 
     # Exec command
-    foreach my $line ( @{ $self->{command_return} } ) {
-        my ( $date, $time, $name ) = split( / /, $line );
+    foreach my $line (@{$self->{command_return}}) {
+        my ($date, $time, $name) = split / /, $line;
         my $creationdate = $date . " " . $time;
-        push( @buckets, { Name => $name, CreationDate => $creationdate } );
+        push(@buckets, { Name => $name, CreationDate => $creationdate });
     }
 
     # Compute data
     foreach my $bucket (@buckets) {
         $self->{result}->{'S3'}->{ $bucket->{Name} } =
-          { 'Creation date' => $bucket->{CreationDate} };
+          { Creation date => $bucket->{CreationDate} };
         $self->{result}->{count}->{'S3'}++;
     }
 }
@@ -161,12 +156,12 @@ sub RDS {
     $self->{command_return} = $awsapi->execReq($apiRequest);
 
     # Compute data
-    foreach my $dbinstance ( @{ $self->{command_return}->{DBInstances} } ) {
-        $self->{result}->{'RDS'}->{ $dbinstance->{DBInstanceIdentifier} } = {
-            'State' => $dbinstance->{DBInstanceStatus},
-            'Name'  => $dbinstance->{DBInstanceIdentifier}
+    foreach my $dbinstance (@{$self->{command_return}->{DBInstances}}) {
+        $self->{result}->{'RDS'}->{$dbinstance->{DBInstanceIdentifier}} = {
+            State => $dbinstance->{DBInstanceStatus},
+            Name  => $dbinstance->{DBInstanceIdentifier}
         };
-        $self->{result}->{count}->{'RDS'}++;
+        $self->{result}->{count}->{RDS}++;
     }
 }
 
@@ -181,9 +176,8 @@ sub disco_show {
     my ( $self, %options ) = @_;
 
     $self->api_request(%options);
-
-    foreach my $service ( @Disco_service_tab ) {
-        foreach my $device ( keys %{ $self->{result}->{$service} } ) {
+    foreach my $service (@Disco_service_tab) {
+        foreach my $device (keys %{$self->{result}->{$service}}) {
             $self->{output}->add_disco_entry(
                 name  => $self->{result}->{$service}->{$device}->{Name},
                 id    => $device,
@@ -200,14 +194,11 @@ sub run {
     $self->api_request(%options);
 
     # Send formated data to Centreon
-    foreach my $service ( @{ $self->{option_results}->{servicetab} } ) {
-        $self->{output}
-          ->output_add( long_msg => sprintf( "AWS service: %s", $service ) );
-        foreach my $device ( keys %{ $self->{result}->{$service} } ) {
+    foreach my $service (@{$self->{option_results}->{servicetab}}) {
+        $self->{output}->output_add(long_msg => sprintf("AWS service: %s", $service));
+        foreach my $device (keys %{$self->{result}->{$service}}) {
             my $output = $device . " [";
-            foreach my $value (
-                sort( keys %{ $self->{result}->{$service}->{$device} } ) )
-            {
+            foreach my $value (sort(keys %{$self->{result}->{$service}->{$device}})) {
                 $output =
                     $output 
                   . $value . " = "