cleanup imported modules list

bin/account-manager-client.pl

@@ -20,13 +20,13 @@ use Pod::Usage;
 use Conf;
 use IdPAccountManager::Data::AuthenticationToken;
 use IdPAccountManager::Data::AuthenticationToken::Manager;
-use IdPAccountManager::Data::TestAccount;
-use IdPAccountManager::Data::TestAccount::Manager;
 use IdPAccountManager::Data::ServiceProvider;
 use IdPAccountManager::Data::ServiceProvider::Manager;
-use IdPAccountManager::SAMLMetadata;
+use IdPAccountManager::Data::TestAccount;
+use IdPAccountManager::Data::TestAccount::Manager;
 use IdPAccountManager::Configuration;
 use IdPAccountManager::Logger;
+use IdPAccountManager::SAMLMetadata;
 
 my %options;
 GetOptions(

bin/account-manager-web.pl

@@ -12,14 +12,6 @@ use warnings;
 use utf8;
 use lib qw(lib conf);
 
-use CGI;
-use CGI::Cookie;
-use CGI::Util;
-use Template;
-use Template::Constants qw( :debug );
-
-use IdPAccountManager::SAMLMetadata;
-
 use IdPAccountManager::Configuration;
 use IdPAccountManager::WebRequest;
 

lib/IdPAccountManager/SAMLMetadata.pm

@@ -8,11 +8,11 @@ use strict;
 use warnings;
 
 use English qw(-no_match_vars);
+use XML::LibXML;
+
 use IdPAccountManager::Tools;
 use IdPAccountManager::Logger;
 
-use XML::LibXML;
-
 sub new {
     my ($pkg, %args) = @_;
 

lib/IdPAccountManager/Tools.pm

@@ -4,13 +4,10 @@ package IdPAccountManager::Tools;
 ## This software was developed by RENATER. The research leading to these results has received funding
 ## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
 
-use Template;
-
-# load Template::Stash to make method tables visible
-use Template::Stash;
-
 use Digest::SHA;
 use Encode;
+use Template;
+use Template::Stash;
 
 INIT {
     ## a TT2 virtual method to get a variable type

lib/IdPAccountManager/WebRequest.pm

@@ -3,11 +3,16 @@ package IdPAccountManager::WebRequest;
 use strict;
 use warnings;
 
+use CGI;
+use CGI::Cookie;
 use English qw(-no_match_vars);
-use IdPAccountManager::Logger;
+use Template;
+
 use IdPAccountManager::Data::TestAccount;
 use IdPAccountManager::Data::AuthenticationToken;
 use IdPAccountManager::Data::ServiceProvider;
+use IdPAccountManager::Logger;
+use IdPAccountManager::SAMLMetadata;
 
 ## New web request
 sub new {