diff --git a/README.txt b/README.txt
index bbd9f59..7ec6e76 100644
--- a/README.txt
+++ b/README.txt
@@ -16,7 +16,7 @@ Introduction
 ============
 
 This package provides a hook into Zope's ZPublisher that is run after the
-publisher has completed publication, but before the the transaction is commited
+publisher has completed publication, but before the the transaction is committed
 and the response is returned to the requesting browser. This is practical for
 caching purposes: it is the ideal place to determine and insert caching headers
 into the response.
@@ -82,4 +82,4 @@ Register it in zcml the same way::
 
 .. _zope.event: http://pypi.python.org/pypi/zope.event
 .. _zope.component: http://pypi.python.org/pypi/zope.component
-.. ZPublisherEventsBackport: http://pypi.python.org/pypi/ZPublisherEventsBackport
+.. _ZPublisherEventsBackport: http://pypi.python.org/pypi/ZPublisherEventsBackport
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index d726a57..6bf4dc4 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -2,16 +2,17 @@ Changelog
 =========
 
 1.1 - Unreleased
--------------------------
+----------------
 
-* Refactor to use ZPublisher publication events (available in Zope 1.10 with
+* General and metadata cleanup.
+  [hannosch]
+
+* Refactor to use ZPublisher publication events (available in Zope 2.10 with
   ZPublisherEventsBackport.)
   [lrowe]
 
-1.0rc1 - October 15, 2008
--------------------------
+1.0rc1 - 2008-10-15
+-------------------
 
 * Initial release
   [wichert]
-
-
diff --git a/plone/__init__.py b/plone/__init__.py
index f48ad10..de40ea7 100644
--- a/plone/__init__.py
+++ b/plone/__init__.py
@@ -1,6 +1 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/plone/postpublicationhook/__init__.py b/plone/postpublicationhook/__init__.py
index e0e0e8d..792d600 100644
--- a/plone/postpublicationhook/__init__.py
+++ b/plone/postpublicationhook/__init__.py
@@ -1 +1 @@
-# make it a package
+#
diff --git a/plone/postpublicationhook/event.py b/plone/postpublicationhook/event.py
index c69a4c4..afeabea 100644
--- a/plone/postpublicationhook/event.py
+++ b/plone/postpublicationhook/event.py
@@ -1,6 +1,7 @@
 from zope.interface import implements
 from zope.component.interfaces import ObjectEvent
 from zope.event import notify
+
 from plone.postpublicationhook.interfaces import IAfterPublicationEvent
 
 
diff --git a/plone/postpublicationhook/interfaces.py b/plone/postpublicationhook/interfaces.py
index 6a35004..d3d32ee 100644
--- a/plone/postpublicationhook/interfaces.py
+++ b/plone/postpublicationhook/interfaces.py
@@ -1,6 +1,7 @@
 from zope.component.interfaces import IObjectEvent
 from zope.interface import Attribute
 
+
 class IAfterPublicationEvent(IObjectEvent):
     """An event which is fired after publication, but before the transaction is
     commited."""
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 01bb954..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
diff --git a/setup.py b/setup.py
index e924583..3db5ef4 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
         "Framework :: Zope2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Zope Public License",
-        "Topic :: Software Development :: Libraries :: Python Modules",
         ],
       keywords='',
       author='Wichert Akkerman',
@@ -35,4 +34,3 @@
           'Zope2.10': ['ZPublisherEventsBackport'],
       },
       )
-