diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
index 3e56f28c5b..7b5dc3aacc 100644
--- a/Library/Homebrew/cmd/cleanup.rb
+++ b/Library/Homebrew/cmd/cleanup.rb
@@ -34,10 +34,10 @@ module Homebrew extend self
 
   def cleanup_formula f
     if f.installed?
-      f.rack.subdirs.each do |keg|
-        if f.version > Keg.new(keg).version
+      f.rack.subdirs.map { |d| Keg.new(d) }.each do |keg|
+        if f.version > keg.version
           if f.can_cleanup?
-            if !Keg.new(keg).linked?
+            if !keg.linked?
               if ARGV.dry_run?
                 puts "Would remove: #{keg}"
               else