diff --git a/cataloguing/value_builder/marc21_field_003.pl b/cataloguing/value_builder/marc21_field_003.pl
index ef0eca5ba8..4a3b5164bc 100755
--- a/cataloguing/value_builder/marc21_field_003.pl
+++ b/cataloguing/value_builder/marc21_field_003.pl
@@ -26,7 +26,6 @@ sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
 
-    # find today's date
     my $org = C4::Context->preference('MARCOrgCode');
     my $res  = "
 <script type=\"text/javascript\">
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index ff5f74f864..ad8d64d917 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -19,7 +19,6 @@
 
 use strict;
 #use warnings; FIXME - Bug 2505
-#use C4::Context;
 
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index bbaf366524..0268a33f78 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -28,12 +28,6 @@ use C4::Output;
 
 use XML::LibXML;
 
-=head1 DESCRIPTION
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-
 sub plugin_javascript {
     my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
     my $function_name = $field_number;
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index d65c33ede9..65f7d09d73 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -27,12 +27,6 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1 DESCRIPTION
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-
 sub plugin_javascript {
     my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
     my $function_name = $field_number;
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 01d63d76c6..9503fe090c 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -29,18 +29,13 @@ use C4::Output;
 use XML::LibXML;
 use Koha::Util::FrameworkPlugin qw|date_entered|;
 
-=head1 DESCRIPTION
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-
 sub plugin_javascript {
+    my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
+
     my $lang = C4::Context->preference('DefaultLanguageField008' );
     $lang = "eng" unless $lang;
     $lang = pack("A3", $lang);
 
-    my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
     my $function_name = $field_number;
     my $dateentered = date_entered();
     my $res           = "
@@ -76,11 +71,11 @@ function Clic$function_name(i) {
 }
 
 sub plugin {
+    my ($input) = @_;
     my $lang = C4::Context->preference('DefaultLanguageField008' );
     $lang = "eng" unless $lang;
     $lang = pack("A3", $lang);
 
-    my ($input) = @_;
     my $index   = $input->param('index');
     my $result  = $input->param('result');
     my $leader  = $input->param('leader');
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index e6ddbd7510..699ab65e32 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -30,12 +30,6 @@ use Koha::Util::FrameworkPlugin qw|date_entered|;
 use constant FIXLEN_DATA_ELTS => '|| aca||aabn           | a|a     d';
 use constant PREF_008 => 'MARCAuthorityControlField008';
 
-=head1 DESCRIPTION
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
@@ -69,6 +63,7 @@ function Clic$function_name(i) {
 
     return ($function_name,$res);
 }
+
 sub plugin {
     my ($input) = @_;
     my $index= $input->param('index');
diff --git a/cataloguing/value_builder/marc21_field_040c.pl b/cataloguing/value_builder/marc21_field_040c.pl
index a00f1fccbf..35cc7b370d 100755
--- a/cataloguing/value_builder/marc21_field_040c.pl
+++ b/cataloguing/value_builder/marc21_field_040c.pl
@@ -20,13 +20,11 @@
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-# use MARC::Record;
 
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
 
-    # find today's date
     my $org = C4::Context->preference('MARCOrgCode');
     my $res  = "
 <script type=\"text/javascript\">
diff --git a/cataloguing/value_builder/marc21_field_040d.pl b/cataloguing/value_builder/marc21_field_040d.pl
index f636d36e4a..aad04b111f 100755
--- a/cataloguing/value_builder/marc21_field_040d.pl
+++ b/cataloguing/value_builder/marc21_field_040d.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -21,19 +20,11 @@
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
-# use MARC::Record;
-
-=head1 DESCRIPTION
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
 
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name = $field_number;
 
-    # find today's date
     my $org = C4::Context->preference('MARCOrgCode');
     my $res  = "
 <script type=\"text/javascript\">
@@ -47,5 +38,5 @@ function Focus$function_name(subfield_managed) {
 //]]>
 </script>
 ";
-return ($function_name,$res);
+    return ($function_name,$res);
 }
diff --git a/cataloguing/value_builder/marc21_field_245h.pl b/cataloguing/value_builder/marc21_field_245h.pl
index 8d4b3564f3..1912c4cc46 100755
--- a/cataloguing/value_builder/marc21_field_245h.pl
+++ b/cataloguing/value_builder/marc21_field_245h.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2009 Kyle Hall <kyle.m.hall@gmail.com>
 #
 # This file is part of Koha.
@@ -44,5 +43,5 @@ function Blur$function_name(index) {
 //]]>
 </script>
 ";
-return ($function_name,$res);
+    return ($function_name,$res);
 }
diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl
index 723840f8c1..f53ed2a9b8 100644
--- a/cataloguing/value_builder/marc21_linking_section.pl
+++ b/cataloguing/value_builder/marc21_linking_section.pl
@@ -49,19 +49,14 @@ sub plugin_javascript {
     return ( $function_name, $res );
 }
 
-# sub plugin
-#
-# input arg :
-# -- op could be equals to
-# * fillinput :
-# * do_search :
-#
-
 sub plugin {
-    my ($input)   = @_;
+    my ($query)   = @_;
     my $dbh       = C4::Context->dbh;
-    my $query     = new CGI;
     my $op        = $query->param('op');
+    # -- op could be equal to
+    # * fillinput
+    # * do_search
+
     my $type      = $query->param('type');
     my $startfrom = $query->param('startfrom');
     $startfrom = 0 if ( !defined $startfrom );