diff --git a/libraries/helpers.rb b/libraries/helpers.rb
index 6e14cb6..f19c4a6 100644
--- a/libraries/helpers.rb
+++ b/libraries/helpers.rb
@@ -19,23 +19,22 @@
 # limitations under the License.
 #
 
-# class HomebrewUserWrapper
-#   require 'chef/mixin/homebrew'
-#   include Chef::Mixin::Homebrew
-#   # require Chef::VERSION >= Chef::Version.new('18.6.2') ? 'chef/mixin/homebrew' : 'chef/mixin/homebrew_user'
-#   # include Chef::VERSION >= Chef::Version.new('18.6.2') ? Chef::Mixin::Homebrew : Chef::Mixin::HomebrewUser
-#   include Chef::Mixin::Which
-# end
-
-module HomebrewHelper
+class HomebrewUserWrapper
   require 'chef/mixin/homebrew'
   include Chef::Mixin::Homebrew
+  # require Chef::VERSION >= Chef::Version.new('18.6.2') ? 'chef/mixin/homebrew' : 'chef/mixin/homebrew_user'
+  # include Chef::VERSION >= Chef::Version.new('18.6.2') ? Chef::Mixin::Homebrew : Chef::Mixin::HomebrewUser
+  include Chef::Mixin::Which
+end
+
+module Homebrew
+  extend self
 
   require 'mixlib/shellout'
   include Chef::Mixin::ShellOut
 
   def self.included(base)
-    base.extend(HomebrewHelper)
+    base.extend(Homebrew)
   end
 
   def install_path
@@ -94,7 +93,7 @@ def sudo_user
   def current_user
     ENV['USER']
   end
-end # unless defined?(Homebrew)
+end unless defined?(Homebrew)
 
 class HomebrewWrapper
   include HomebrewHelper
diff --git a/recipes/default.rb b/recipes/default.rb
index 98e6dfa..39c0aab 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 
-unless HomebrewHelper.exist?
+unless Homebrew.exist?
   homebrew_go = "#{Chef::Config[:file_cache_path]}/homebrew_go"
 
   # Grant Homebrew install script permission to execute