diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 42089d4d876944069494e323c1830e598eaab0a5..f54f833ebb950d8c000485f62c89b76ccd7e3417 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -239,7 +239,7 @@ module Homebrew
 
     if !f.options.empty? || f.head || f.devel
       ohai "Options"
-      Homebrew.dump_options_for_formula f
+      Options.dump_for_formula f
     end
 
     caveats = Caveats.new(f)
diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb
index f82a029bcf62a4db1cefb1cba3c526671692ebed..cf6c7aaad8bf5cb9fa3982432df2838d8f6c7de5 100644
--- a/Library/Homebrew/cmd/options.rb
+++ b/Library/Homebrew/cmd/options.rb
@@ -80,7 +80,7 @@ module Homebrew
         puts f.options.as_flags.sort * " "
       else
         puts f.full_name if formulae.length > 1
-        dump_options_for_formula f
+        Options.dump_for_formula f
         puts
       end
     end
diff --git a/Library/Homebrew/options.rb b/Library/Homebrew/options.rb
index c386c2ee4b0a78a8cd04d9783e270fc4a48bf65a..7823e1ebbfb36306744b4a209a0cbccfe7d2aa11 100644
--- a/Library/Homebrew/options.rb
+++ b/Library/Homebrew/options.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# A formula option.
+#
+# @api private
 class Option
   attr_reader :name, :description, :flag
 
@@ -33,6 +36,9 @@ class Option
   end
 end
 
+# A deprecated formula option.
+#
+# @api private
 class DeprecatedOption
   attr_reader :old, :current
 
@@ -55,6 +61,9 @@ class DeprecatedOption
   alias eql? ==
 end
 
+# A collection of formula options.
+#
+# @api private
 class Options
   include Enumerable
 
@@ -112,12 +121,8 @@ class Options
   def inspect
     "#<#{self.class.name}: #{to_a.inspect}>"
   end
-end
-
-module Homebrew
-  module_function
 
-  def dump_options_for_formula(f)
+  def self.dump_for_formula(f)
     f.options.sort_by(&:flag).each do |opt|
       puts "#{opt.flag}\n\t#{opt.description}"
     end