diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index b01f40b77..7e7605960 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -1,6 +1,8 @@
 package WebGUI::Asset::Event;
 
-$VERSION = "0.0.0";
+use strict;
+
+our $VERSION = "0.0.0";
 
 ####################################################################
 # WebGUI is Copyright 2001-2007 Plain Black Corporation.
@@ -12,8 +14,6 @@ $VERSION = "0.0.0";
 # http://www.plainblack.com                     info@plainblack.com
 ####################################################################
 
-use strict;
-
 use Tie::IxHash;
 use Carp qw(croak);
 use Storable qw(nfreeze thaw);
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 1e1b214c5..8755ccb8f 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -1,6 +1,8 @@
 package WebGUI::Asset::Wobject::Calendar;
 
-$VERSION = "0.0.0";
+use strict;
+
+our $VERSION = "0.0.0";
 
 ####################################################################
 # WebGUI is Copyright 2001-2007 Plain Black Corporation.
@@ -12,8 +14,6 @@ $VERSION = "0.0.0";
 # http://www.plainblack.com                     info@plainblack.com
 ####################################################################
 
-use strict;
-
 use Tie::IxHash;
 
 use WebGUI::Utility;
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
index 598bd8243..9502c43f7 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
@@ -1,5 +1,7 @@
 package WebGUI::Asset::Wobject::HttpProxy::Parse;
 
+use strict;
+
 =head1 LEGAL
 
  -------------------------------------------------------------------
@@ -70,7 +72,7 @@ sub new {
 	$self->{assetUrl} = shift;
     
     my $pfilter = shift;
-    $pfiler =~ s/\r//g;
+    $pfilter =~ s/\r//g;
     my @patterns = split(/\n/,$pfilter); 
     $self->{patternFilter} = \@patterns;
    
@@ -166,7 +168,7 @@ sub start {
 						    $val =~ s/\n//g;	# Bugfix 757068
                             
                             #Determine if pattern should not be rewritten
-                            $rewritePattern = 0;
+                            my $rewritePattern = 0;
                             foreach my $pattern (@{$self->{patternFilter}}) {
                                 if($val =~ m/$pattern/i) {
                                     $rewritePattern = 1;
diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
index f4a48ae1a..387a2f02e 100644
--- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm
+++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
@@ -1,6 +1,7 @@
 package WebGUI::Asset::Wobject::ProjectManager;
 
-$VERSION = "1.0.0";
+use strict;
+our $VERSION = "1.0.0";
 
 #-------------------------------------------------------------------
 # WebGUI is Copyright 2001-2007 Plain Black Corporation.
@@ -12,7 +13,6 @@ $VERSION = "1.0.0";
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use strict;
 use DateTime;
 use Tie::IxHash;
 use WebGUI::International;
diff --git a/lib/WebGUI/Asset/Wobject/TimeTracking.pm b/lib/WebGUI/Asset/Wobject/TimeTracking.pm
index c88351d02..b3ec28e55 100644
--- a/lib/WebGUI/Asset/Wobject/TimeTracking.pm
+++ b/lib/WebGUI/Asset/Wobject/TimeTracking.pm
@@ -1,6 +1,7 @@
 package WebGUI::Asset::Wobject::TimeTracking;
 
-$VERSION = "1.0.0";
+use strict;
+our $VERSION = "1.0.0";
 
 #-------------------------------------------------------------------
 # WebGUI is Copyright 2001-2007 Plain Black Corporation.
@@ -12,7 +13,6 @@ $VERSION = "1.0.0";
 # http://www.plainblack.com                     info@plainblack.com
 #-------------------------------------------------------------------
 
-use strict;
 use DateTime;
 use Tie::IxHash;
 use WebGUI::International;
diff --git a/lib/WebGUI/Commerce/Item.pm b/lib/WebGUI/Commerce/Item.pm
index 070d1edda..9146f248c 100644
--- a/lib/WebGUI/Commerce/Item.pm
+++ b/lib/WebGUI/Commerce/Item.pm
@@ -1,5 +1,7 @@
 package WebGUI::Commerce::Item;
 
+use strict;
+
 =head1 LEGAL
 
  -------------------------------------------------------------------
@@ -170,20 +172,16 @@ The type (namespace) of the item you want.
 =cut
 
 sub new {
-	my ($class, $session, $namespace, $load, $cmd, $plugin);
-    	$class = shift;
-    	$session = shift;
-	$id = shift;
-	$namespace = shift;
+    my ($class, $session, $id, $namespace) = @_;
 	
 	$session->errorHandler->fatal('No namespace') unless ($namespace);
 	$session->errorHandler->fatal('No ID') unless ($id);
 	
-    	$cmd = "WebGUI::Commerce::Item::$namespace";
-	$load = "use $cmd";
+    my $cmd = "WebGUI::Commerce::Item::$namespace";
+	my $load = "use $cmd";
 	eval($load);
 	$session->errorHandler->warn("Item plugin failed to compile: $cmd.".$@) if($@);
-	$plugin = eval($cmd.'->new($session, "$id", "$namespace")');
+	my $plugin = eval($cmd.'->new($session, "$id", "$namespace")');
 	$session->errorHandler->warn("Couldn't instantiate Item plugin: $cmd.".$@) if($@);
 	return $plugin;
 }
diff --git a/lib/WebGUI/Commerce/Shipping/ByPrice.pm b/lib/WebGUI/Commerce/Shipping/ByPrice.pm
index 44d17eeb7..b81f24398 100644
--- a/lib/WebGUI/Commerce/Shipping/ByPrice.pm
+++ b/lib/WebGUI/Commerce/Shipping/ByPrice.pm
@@ -1,5 +1,7 @@
 package WebGUI::Commerce::Shipping::ByPrice;
 
+use strict;
+
 =head1 LEGAL
 
  -------------------------------------------------------------------
@@ -24,8 +26,6 @@ Shipping plugin for determining shipping cost by a percentage of total price.
 
 our @ISA = qw(WebGUI::Commerce::Shipping);
 
-use strict;
-
 #-------------------------------------------------------------------
 
 =head2 calc ( $session )
diff --git a/lib/WebGUI/Commerce/Shipping/ByWeight.pm b/lib/WebGUI/Commerce/Shipping/ByWeight.pm
index ca0d33670..22f644f4e 100644
--- a/lib/WebGUI/Commerce/Shipping/ByWeight.pm
+++ b/lib/WebGUI/Commerce/Shipping/ByWeight.pm
@@ -1,5 +1,7 @@
 package WebGUI::Commerce::Shipping::ByWeight;
 
+use strict;
+
 =head1 LEGAL
 
  -------------------------------------------------------------------
@@ -25,8 +27,6 @@ or products being purchased.
 
 our @ISA = qw(WebGUI::Commerce::Shipping);
 
-use strict;
-
 #-------------------------------------------------------------------
 
 =head2 calc ( $session )
diff --git a/lib/WebGUI/Commerce/Shipping/PerTransaction.pm b/lib/WebGUI/Commerce/Shipping/PerTransaction.pm
index ca4a9e135..44c45a935 100644
--- a/lib/WebGUI/Commerce/Shipping/PerTransaction.pm
+++ b/lib/WebGUI/Commerce/Shipping/PerTransaction.pm
@@ -1,5 +1,7 @@
 package WebGUI::Commerce::Shipping::PerTransaction;
 
+use strict;
+
 =head1 LEGAL
 
  -------------------------------------------------------------------
@@ -24,8 +26,6 @@ Shipping plugin for a fixed shipping costs per transaction.
 
 our @ISA = qw(WebGUI::Commerce::Shipping);
 
-use strict;
-
 #-------------------------------------------------------------------
 
 =head2 calc ( $self )