diff --git a/hgwebdir.cgi b/hgwebdir.cgi
--- a/hgwebdir.cgi
+++ b/hgwebdir.cgi
@@ -2,10 +2,22 @@
 #
 # An example CGI script to export multiple hgweb repos, edit as necessary
 
-import cgitb, sys
+# send python tracebacks to the browser if an error occurs:
+import cgitb
 cgitb.enable()
 
-# sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
+# adjust python path if not a system-wide install:
+#import sys
+#sys.path.insert(0, "/path/to/python/lib")
+
+# If you'd like to serve pages with UTF-8 instead of your default
+# locale charset, you can do so by uncommenting the following lines.
+# Note that this will cause your .hgrc files to be interpreted in
+# UTF-8 and all your repo files to be displayed using UTF-8.
+#
+#import os
+#os.environ["HGENCODING"] = "UTF-8"
+
 from mercurial.hgweb.hgwebdir_mod import hgwebdir
 from mercurial.hgweb.request import wsgiapplication
 import mercurial.hgweb.wsgicgi as wsgicgi
@@ -25,17 +37,10 @@ import mercurial.hgweb.wsgicgi as wsgicg
 #   [collections]
 #   /foo = /foo
 # Then repos will list as bar and quux/baz.
-
+#
 # Alternatively you can pass a list of ('virtual/path', '/real/path') tuples
 # or use a dictionary with entries like 'virtual/path': '/real/path'
 
-# If you'd like to serve pages with UTF-8 instead of your default
-# locale charset, you can do so by uncommenting the following lines.
-# Note that this will cause your .hgrc files to be interpreted in
-# UTF-8 and all your repo files to be displayed using UTF-8.
-#
-# os.environ["HGENCODING"] = "UTF-8"
-
 def make_web_app():
     return hgwebdir("hgweb.config")