diff --git a/plugins/Admin/__init__.py b/plugins/Admin/__init__.py
index 7b2006c0a..ef6196ffe 100644
--- a/plugins/Admin/__init__.py
+++ b/plugins/Admin/__init__.py
@@ -27,6 +27,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+These are commands useful for administrating the bot; they all require their
+caller to have the 'admin' capability.  This plugin is loaded by default.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Admin/plugin.py b/plugins/Admin/plugin.py
index fc123c768..f7618b9a4 100644
--- a/plugins/Admin/plugin.py
+++ b/plugins/Admin/plugin.py
@@ -27,11 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-These are commands useful for administrating the bot; they all require their
-caller to have the 'admin' capability.  This plugin is loaded by default.
-"""
-
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Channel/__init__.py b/plugins/Channel/__init__.py
index 0de6354ed..d90a4d1b0 100644
--- a/plugins/Channel/__init__.py
+++ b/plugins/Channel/__init__.py
@@ -27,6 +27,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+Basic channel management commands.  Many of these commands require their caller
+to have the <channel>.op capability.  This plugin is loaded by default.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Channel/plugin.py b/plugins/Channel/plugin.py
index 02b2fe489..1e518467e 100644
--- a/plugins/Channel/plugin.py
+++ b/plugins/Channel/plugin.py
@@ -27,11 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-Basic channel management commands.  Many of these commands require their caller
-to have the <channel>.op capability.  This plugin is loaded by default.
-"""
-
 import sys
 import time
 
diff --git a/plugins/Config/__init__.py b/plugins/Config/__init__.py
index ac782609e..998bc9011 100644
--- a/plugins/Config/__init__.py
+++ b/plugins/Config/__init__.py
@@ -27,6 +27,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+Handles configuration of the bot while it is running.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Config/plugin.py b/plugins/Config/plugin.py
index 3f6fc7865..fcd881c8f 100644
--- a/plugins/Config/plugin.py
+++ b/plugins/Config/plugin.py
@@ -27,10 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-Handles configuration of the bot while it is running.
-"""
-
 import os
 import getopt
 import signal
diff --git a/plugins/Misc/__init__.py b/plugins/Misc/__init__.py
index d02bb0d48..e47678da5 100644
--- a/plugins/Misc/__init__.py
+++ b/plugins/Misc/__init__.py
@@ -27,6 +27,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+Miscellaneous commands.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py
index ade4bd8e7..2f7f365a1 100644
--- a/plugins/Misc/plugin.py
+++ b/plugins/Misc/plugin.py
@@ -27,10 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-Miscellaneous commands.
-"""
-
 import supybot
 
 import supybot.fix as fix
diff --git a/plugins/Owner/__init__.py b/plugins/Owner/__init__.py
index ac782609e..6d9c0a975 100644
--- a/plugins/Owner/__init__.py
+++ b/plugins/Owner/__init__.py
@@ -27,6 +27,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+Provides commands useful to the owner of the bot; the commands here require
+their caller to have the 'owner' capability.  This plugin is loaded by default.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py
index 1dd9cc66e..15c6d2a63 100644
--- a/plugins/Owner/plugin.py
+++ b/plugins/Owner/plugin.py
@@ -27,11 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-Provides commands useful to the owner of the bot; the commands here require
-their caller to have the 'owner' capability.  This plugin is loaded by default.
-"""
-
 import supybot.fix as fix
 
 import gc
diff --git a/plugins/User/__init__.py b/plugins/User/__init__.py
index ac782609e..d69ffd65f 100644
--- a/plugins/User/__init__.py
+++ b/plugins/User/__init__.py
@@ -27,6 +27,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
+"""
+Provides commands useful to users in general. This plugin is loaded by default.
+"""
+
 import supybot
 
 __author__ = supybot.authors.jemfinch
diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py
index 8e60bb4cc..331b0d861 100644
--- a/plugins/User/plugin.py
+++ b/plugins/User/plugin.py
@@ -27,10 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""
-Provides commands useful to users in general. This plugin is loaded by default.
-"""
-
 import supybot.fix as fix
 
 import re