diff --git a/snmp_standard/mode/loadaverage.pm b/snmp_standard/mode/loadaverage.pm
index 1f0d44772..8c66e3be0 100644
--- a/snmp_standard/mode/loadaverage.pm
+++ b/snmp_standard/mode/loadaverage.pm
@@ -33,7 +33,7 @@ sub new {
     $options{options}->add_options(arguments => { 
         'warning:s'   => { name => 'warning', default => '' },
         'critical:s'  => { name => 'critical', default => '' },
-        'average'     => { name => 'average' },
+        'average'     => { name => 'average' }
     });
 
     return $self;
@@ -104,71 +104,108 @@ sub run {
         $cpu_load1 = sprintf("%0.2f", $result->{$oid_CpuLoad1m} / $countCpu);
         $cpu_load5 = sprintf("%0.2f", $result->{$oid_CpuLoad5m} / $countCpu);
         $cpu_load15 = sprintf("%0.2f", $result->{$oid_CpuLoad15m} / $countCpu);
-        $msg = sprintf("Load average: %s [%s/%s CPUs], %s [%s/%s CPUs], %s [%s/%s CPUs]", $cpu_load1, $result->{$oid_CpuLoad1m}, $countCpu,
-                       $cpu_load5, $result->{$oid_CpuLoad5m}, $countCpu,
-                       $cpu_load15, $result->{$oid_CpuLoad15m}, $countCpu);
-        $self->{output}->perfdata_add(label => 'avg_load1',
-                                  value => $cpu_load1,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'avg_load5',
-                                  value => $cpu_load5,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'avg_load15',
-                                  value => $cpu_load15,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
-                                  min => 0);
-         $self->{output}->perfdata_add(label => 'load1',
-                                  value => $result->{$oid_CpuLoad1m},
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1', op => '*', value => $countCpu),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1', op => '*', value => $countCpu),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'load5',
-                                  value => $result->{$oid_CpuLoad5m},
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5', op => '*', value => $countCpu),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5', op => '*', value => $countCpu),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'load15',
-                                  value => $result->{$oid_CpuLoad15m},
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15', op => '*', value => $countCpu),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15', op => '*', value => $countCpu),
-                                  min => 0);
+        $msg = sprintf(
+            "Load average: %s [%s/%s CPUs], %s [%s/%s CPUs], %s [%s/%s CPUs]",
+            $cpu_load1, $result->{$oid_CpuLoad1m}, $countCpu,
+            $cpu_load5, $result->{$oid_CpuLoad5m}, $countCpu,
+            $cpu_load15, $result->{$oid_CpuLoad15m}, $countCpu
+        );
+        $self->{output}->perfdata_add(
+            label => 'avg_load1',
+            nlabel => 'load.1m.average.count',
+            value => $cpu_load1,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'avg_load5',
+            nlabel => 'load.5m.average.count',
+            value => $cpu_load5,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'avg_load15',
+            nlabel => 'load.15m.average.count',
+            value => $cpu_load15,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
+            min => 0);
+         $self->{output}->perfdata_add(
+            label => 'load1',
+            nlabel => 'load.1m.count',
+            value => $result->{$oid_CpuLoad1m},
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1', op => '*', value => $countCpu),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1', op => '*', value => $countCpu),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'load5',
+            nlabel => 'load.5m.count',
+            value => $result->{$oid_CpuLoad5m},
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5', op => '*', value => $countCpu),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5', op => '*', value => $countCpu),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'load15',
+            nlabel => 'load.15m.count',
+            value => $result->{$oid_CpuLoad15m},
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15', op => '*', value => $countCpu),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15', op => '*', value => $countCpu),
+            min => 0
+        );
     } else {
         $cpu_load1 = $result->{$oid_CpuLoad1m};
         $cpu_load5 = $result->{$oid_CpuLoad5m};
         $cpu_load15 = $result->{$oid_CpuLoad15m};
     
         $msg = sprintf("Load average: %s, %s, %s", $cpu_load1, $cpu_load5, $cpu_load15);
-        $self->{output}->perfdata_add(label => 'load1',
-                                  value => $cpu_load1,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'load5',
-                                  value => $cpu_load5,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
-                                  min => 0);
-        $self->{output}->perfdata_add(label => 'load15',
-                                  value => $cpu_load15,
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
-                                  min => 0);
+        $self->{output}->perfdata_add(
+            label => 'load1',
+            nlabel => 'load.1m.count',
+            value => $cpu_load1,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'load5',
+            nlabel => 'load.5m.count',
+            value => $cpu_load5,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
+            min => 0
+        );
+        $self->{output}->perfdata_add(
+            label => 'load15',
+            nlabel => 'load.15m.count',
+            value => $cpu_load15,
+            warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
+            critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
+            min => 0
+        );
     }
     
-    my $exit1 = $self->{perfdata}->threshold_check(value => $cpu_load1,
-                                                   threshold => [ { label => 'crit1', 'exit_litteral' => 'critical' }, { label => 'warn1', exit_litteral => 'warning' } ]);
-    my $exit2 = $self->{perfdata}->threshold_check(value => $cpu_load5,
-                                                   threshold => [ { label => 'crit5', 'exit_litteral' => 'critical' }, { label => 'warn5', exit_litteral => 'warning' } ]);
-    my $exit3 = $self->{perfdata}->threshold_check(value => $cpu_load15,
-                                                   threshold => [ { label => 'crit15', 'exit_litteral' => 'critical' }, { label => 'warn15', exit_litteral => 'warning' } ]);
+    my $exit1 = $self->{perfdata}->threshold_check(
+        value => $cpu_load1,
+        threshold => [ { label => 'crit1', exit_litteral => 'critical' }, { label => 'warn1', exit_litteral => 'warning' } ]
+    );
+    my $exit2 = $self->{perfdata}->threshold_check(
+        value => $cpu_load5,
+        threshold => [ { label => 'crit5', exit_litteral => 'critical' }, { label => 'warn5', exit_litteral => 'warning' } ]
+    );
+    my $exit3 = $self->{perfdata}->threshold_check(
+        value => $cpu_load15,
+        threshold => [ { label => 'crit15', exit_litteral => 'critical' }, { label => 'warn15', exit_litteral => 'warning' } ]
+    );
     my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]);
-    $self->{output}->output_add(severity => $exit,
-                                short_msg => $msg);
+    $self->{output}->output_add(
+        severity => $exit,
+        short_msg => $msg
+    );
 
     $self->{output}->display();
     $self->{output}->exit();