diff --git a/install.sh b/install.sh
index f2c4022b05..8d570c86c3 100755
--- a/install.sh
+++ b/install.sh
@@ -528,7 +528,6 @@ RUBY_LIB_FILES="src/mad/ruby/ActionManager.rb \
                 src/mad/ruby/ssh_stream.rb \
                 src/vnm_mad/one_vnm.rb \
                 src/mad/ruby/Ganglia.rb \
-                src/mad/ruby/vmwarelib.rb \
                 src/oca/ruby/OpenNebula.rb \
                 src/tm_mad/TMScript.rb \
                 src/authm_mad/remotes/ssh/ssh_auth.rb \
@@ -618,7 +617,8 @@ VMM_EXEC_VMWARE_SCRIPTS="src/vmm_mad/remotes/vmware/cancel \
                          src/vmm_mad/remotes/vmware/save \
                          src/vmm_mad/remotes/vmware/poll \
                          src/vmm_mad/remotes/vmware/checkpoint \
-                         src/vmm_mad/remotes/vmware/shutdown"
+                         src/vmm_mad/remotes/vmware/shutdown \
+                         src/vmm_mad/remotes/vmware/vmware_driver.rb"
 
 #-------------------------------------------------------------------------------
 # Information Manager Probes, to be installed under $REMOTES_LOCATION/im
diff --git a/src/vmm_mad/remotes/vmware/cancel b/src/vmm_mad/remotes/vmware/cancel
index e5567189bf..7352a66720 100755
--- a/src/vmm_mad/remotes/vmware/cancel
+++ b/src/vmm_mad/remotes/vmware/cancel
@@ -27,11 +27,11 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
-dfile = ARGV[0]
-host  = ARGV[1]
+deploy_id = ARGV[0]
+host      = ARGV[1]
 
 vmware_drv = VMwareDriver.new(host)
 
-vmware_drv.cancel(dfile)
+vmware_drv.cancel(deploy_id)
diff --git a/src/vmm_mad/remotes/vmware/deploy b/src/vmm_mad/remotes/vmware/deploy
index 48cbaedd53..05e89cc98e 100755
--- a/src/vmm_mad/remotes/vmware/deploy
+++ b/src/vmm_mad/remotes/vmware/deploy
@@ -27,7 +27,7 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
 dfile = ARGV[0]
 host  = ARGV[1]
diff --git a/src/vmm_mad/remotes/vmware/poll b/src/vmm_mad/remotes/vmware/poll
index c4454bec60..f4fa915cb2 100755
--- a/src/vmm_mad/remotes/vmware/poll
+++ b/src/vmm_mad/remotes/vmware/poll
@@ -28,7 +28,7 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
 deploy_id = ARGV[0]
 host      = ARGV[1]
diff --git a/src/vmm_mad/remotes/vmware/reboot b/src/vmm_mad/remotes/vmware/reboot
index 3d2c40b383..3c61f64e3b 100755
--- a/src/vmm_mad/remotes/vmware/reboot
+++ b/src/vmm_mad/remotes/vmware/reboot
@@ -27,7 +27,7 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
 deploy_id = ARGV[0]
 host      = ARGV[1]
diff --git a/src/vmm_mad/remotes/vmware/restore b/src/vmm_mad/remotes/vmware/restore
index 7f8702dfbc..feced12ea8 100755
--- a/src/vmm_mad/remotes/vmware/restore
+++ b/src/vmm_mad/remotes/vmware/restore
@@ -27,7 +27,7 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
 checkpoint_file = ARGV[0]
 host            = ARGV[1]
diff --git a/src/vmm_mad/remotes/vmware/save b/src/vmm_mad/remotes/vmware/save
index a8dbf6e35d..60f7eb87eb 100755
--- a/src/vmm_mad/remotes/vmware/save
+++ b/src/vmm_mad/remotes/vmware/save
@@ -27,11 +27,11 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
-deploy_id  = ARGV[0]
-file       = ARGV[1]
-host       = ARGV[2]
+deploy_id = ARGV[0]
+file      = ARGV[1]
+host      = ARGV[2]
 
 vmware_drv = VMwareDriver.new(host)
 
diff --git a/src/vmm_mad/remotes/vmware/shutdown b/src/vmm_mad/remotes/vmware/shutdown
index a32849172e..b154da7dd9 100755
--- a/src/vmm_mad/remotes/vmware/shutdown
+++ b/src/vmm_mad/remotes/vmware/shutdown
@@ -27,10 +27,10 @@ end
 $: << RUBY_LIB_LOCATION
 $: << File.dirname(__FILE__)
 
-require 'vmwarelib'
+require 'vmware_driver'
 
 deploy_id = ARGV[0]
-host     = ARGV[1]
+host      = ARGV[1]
 
 vmware_drv = VMwareDriver.new(host)
 
diff --git a/src/mad/ruby/vmwarelib.rb b/src/vmm_mad/remotes/vmware/vmware_driver.rb
similarity index 98%
rename from src/mad/ruby/vmwarelib.rb
rename to src/vmm_mad/remotes/vmware/vmware_driver.rb
index 908e5588f6..1531ad4958 100644
--- a/src/mad/ruby/vmwarelib.rb
+++ b/src/vmm_mad/remotes/vmware/vmware_driver.rb
@@ -91,9 +91,7 @@ class VMwareDriver
         # Destroy the VM
         rc, info = perform_action("virsh -c #{@uri} destroy #{deploy_id}")
 
-        if rc == false
-            exit info
-        end
+        exit info if rc == false
 
         OpenNebula.log_debug("Successfully canceled domain #{deploy_id}.")
 
@@ -105,12 +103,9 @@ class VMwareDriver
     # Reboots a running VM                                                     #
     # ------------------------------------------------------------------------ #
     def reboot(deploy_id)
-        # Destroy the VM
         rc, info = perform_action("virsh -c #{@uri} reboot #{deploy_id}")
 
-        if rc == false
-            exit info
-        end
+        exit info if rc == false
 
         OpenNebula.log_debug("Domain #{deploy_id} successfully rebooted.")
     end
@@ -128,9 +123,7 @@ class VMwareDriver
     def poll(deploy_id)
         rc, info = do_action("virsh -c #{@uri} --readonly dominfo #{deploy_id}")
 
-        if rc == false
-            return "STATE=d"
-        end
+        return "STATE=d" if rc == false
 
         state = ""