diff --git a/get-committee-rapporteur b/get-committee-rapporteur
index 24dbbfa..40582a9 100644
--- a/get-committee-rapporteur
+++ b/get-committee-rapporteur
@@ -7,7 +7,6 @@ use diagnostics;
 use utf8;
 binmode STDOUT, ":utf8";
 
-use File::Fetch;
 use LWP::Simple;
 
 my @urls = split /\n/, get 'http://www.erikjosefsson.eu/sites/default/files/urltabell3.txt';
@@ -51,36 +50,22 @@ my $table_header = "{| border='1' cellspacing='0' class='wikitable sortable'
 ! tratten link !! summary !! CODE !! AFET !! DROI !! SEDE !! DEVE !! INTA !! BUDG !! CONT !! ECON !! EMPL !! ENVI !! ITRE !! IMCO !! TRAN !! REGI !! AGRI !! PECH !! CULT !! JURI !! LIBE !! AFCO !! FEMM !! PETI !! CRIS\n";
 my $table_footer = "|}\n";
 
-my $committee_array = ("CODE", "AFET", "DROI", "SEDE", "DEVE", "INTA", "BUDG", "CONT", "ECON", "EMPL", "ENVI", "ITRE", "IMCO", "TRAN", "REGI", "AGRI", "PECH", "CULT", "JURI", "LIBE", "AFCO", "FEMM", "PETI", "CRIS");
-$counter = 0;
+my @committee_array = ("CODE", "AFET", "DROI", "SEDE", "DEVE", "INTA", "BUDG", "CONT", "ECON", "EMPL", "ENVI", "ITRE", "IMCO", "TRAN", "REGI", "AGRI", "PECH", "CULT", "JURI", "LIBE", "AFCO", "FEMM", "PETI", "CRIS");
 
 sub display_results
 {
-  $counter = 0;
   my ($commitee, $MEP, $status) = @_;
-  my $abbr = (defined $commities_abbr{$commitee} && $commities_abbr{$commitee}) || "NO COMMITTEE ACRONYM MATCH";
-  while ($counter != 24)
-  {
-     if ($abbr = $committee_array{$counter}) print '| ('.$status.') '.$MEP.' |';
-     if ($abbr != $committee_array{$counter}) print '||';
-     $counter = $counter + 1;
-  }
+  $commities_abbr{$commitee} eq $_ and print " | ($status) $MEP | " or print " || " foreach (@committee_array);
 }
 
 print "$table_header";
 for (@urls)
 {
-  chomp;
-  my $url = $_;
-  print "|-\n";
-  my $page_content = get $url;
+  my $page_content = get $_;
   $page_content =~ m/\s(\S*?)<\/title>/;
-  print "| [[$1]] |";
+  print "|-\n | [[$1]] |";
 
-  while ($page_content =~ /<span>\s*(?:<i>)?.*?(\w[\w\s]*\w)\s+\((responsible|opinion)\)(?:<\/i>)?\s*<\/span>\s*<\/td>\s*<td [^>]*>\s*(?:<br\/>|&nbsp;)?(.*?)\s*<\/td>/msg)
-  {
-    display_results $1, $3, $2;
-  }
+  display_results $1, $3, $2 while ($page_content =~ /<span>\s*(?:<i>)?.*?(\w[\w\s]*\w)\s+\((responsible|opinion)\)(?:<\/i>)?\s*<\/span>\s*<\/td>\s*<td [^>]*>\s*(?:<br\/>|&nbsp;)?(.*?)\s*<\/td>/msg);
   print "|\n";
 }
 print "$table_footer";