diff --git a/lib/docs/core/doc.rb b/lib/docs/core/doc.rb
index e4177e4b..3be16029 100644
--- a/lib/docs/core/doc.rb
+++ b/lib/docs/core/doc.rb
@@ -33,12 +33,14 @@ module Docs
           index_path: index_path }
       end
 
-      def index_page(id)
-        if (page = new.build_page(id)) && page[:entries].present?
-          yield page[:store_path], page[:output]
-          index = EntryIndex.new
-          index.add page[:entries]
-          index
+      def store_page(store, id)
+        store.open(path) do
+          if page = new.build_page(id) and store_page?(page)
+            store.write page[:store_path], page[:output]
+            true
+          else
+            false
+          end
         end
       end
 
@@ -52,13 +54,6 @@ module Docs
         index.empty? ? nil : index
       end
 
-      def store_page(store, id)
-        store.open path do
-          index = index_page(id, &store.method(:write))
-          !!index
-        end
-      end
-
       def store_pages(store)
         store.replace path do
           index = index_pages(&store.method(:write))
@@ -66,6 +61,12 @@ module Docs
           !!index
         end
       end
+
+      private
+
+      def store_page?(page)
+        page[:entries].present?
+      end
     end
 
     def initialize
diff --git a/test/lib/docs/core/doc_test.rb b/test/lib/docs/core/doc_test.rb
index 29bb62fe..8dd178c6 100644
--- a/test/lib/docs/core/doc_test.rb
+++ b/test/lib/docs/core/doc_test.rb
@@ -113,12 +113,12 @@ class DocsDocTest < MiniTest::Spec
     end
   end
 
-  describe ".index_page" do
+  describe ".store_page" do
     it "builds a page" do
       any_instance_of(doc) do |instance|
         stub(instance).build_page('id') { @called = true; nil }
       end
-      doc.index_page('id') {}
+      doc.store_page(store, 'id') {}
       assert @called
     end
 
@@ -130,20 +130,23 @@ class DocsDocTest < MiniTest::Spec
       end
 
       context "and it has :entries" do
-        it "yields the page's :store_path and :output" do
-          doc.index_page('') { |*args| @args = args }
-          assert_equal [page[:store_path], page[:output]], @args
+        it "returns true" do
+          assert doc.store_page(store, 'id')
         end
 
-        it "returns an EntryIndex" do
-          assert_instance_of Docs::EntryIndex, doc.index_page('') {}
+        it "stores a file" do
+          mock(store).write(page[:store_path], page[:output])
+          doc.store_page(store, 'id')
         end
 
-        describe "the index" do
-          it "contains the page's entries" do
-            index = doc.index_page('') {}
-            assert_equal page[:entries], index.entries
+        it "opens the .path directory before storing the file" do
+          stub(doc).path { 'path' }
+          stub(store).write { assert false }
+          mock(store).open('path') do |_, block|
+            stub(store).write
+            block.call
           end
+          doc.store_page(store, 'id')
         end
       end
 
@@ -152,13 +155,13 @@ class DocsDocTest < MiniTest::Spec
           page[:entries] = []
         end
 
-        it "doesn't yield" do
-          doc.index_page('') { |*_| @yield = true }
-          refute @yield
+        it "returns false" do
+          refute doc.store_page(store, 'id')
         end
 
-        it "returns nil" do
-          assert_nil doc.index_page('') {}
+        it "doesn't store a file" do
+          dont_allow(store).write
+          doc.store_page(store, 'id')
         end
       end
     end
@@ -170,13 +173,13 @@ class DocsDocTest < MiniTest::Spec
         end
       end
 
-      it "doesn't yield" do
-        doc.index_page('') { |*_| @yield = true }
-        refute @yield
+      it "returns false" do
+        refute doc.store_page(store, 'id')
       end
 
-      it "returns nil" do
-        assert_nil doc.index_page('') {}
+      it "doesn't store a file" do
+        dont_allow(store).write
+        doc.store_page(store, 'id')
       end
     end
   end
@@ -256,48 +259,6 @@ class DocsDocTest < MiniTest::Spec
     end
   end
 
-  describe ".store_page" do
-    context "when the page is indexed successfully" do
-      before do
-        stub(doc).index_page('id').yields(page[:store_path], page[:output]) { index }
-      end
-
-      it "returns true" do
-        assert doc.store_page(store, 'id')
-      end
-
-      it "stores a file" do
-        mock(store).write(page[:store_path], page[:output])
-        doc.store_page(store, 'id')
-      end
-
-      it "opens the .path directory before storing the file" do
-        stub(doc).path { 'path' }
-        stub(store).write { assert false }
-        mock(store).open('path') do |_, block|
-          stub(store).write
-          block.call
-        end
-        doc.store_page(store, 'id')
-      end
-    end
-
-    context "when the page isn't indexed successfully" do
-      before do
-        stub(doc).index_page('id') { nil }
-      end
-
-      it "returns false" do
-        refute doc.store_page(store, 'id')
-      end
-
-      it "doesn't store a file" do
-        dont_allow(store).write
-        doc.store_page(store, 'id')
-      end
-    end
-  end
-
   describe ".store_pages" do
     context "when pages are indexed successfully" do
       before do