diff --git a/doc/Makefile.am b/doc/Makefile.am
index ea50a9f..169b516 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-
 .PHONY:	clean 
 
 MANDIRS = $(srcdir)/html/ $(srcdir)/html/images
diff --git a/src/librivet/rivetWWW.c b/src/librivet/rivetWWW.c
index 48ea2c0..6f71e92 100644
--- a/src/librivet/rivetWWW.c
+++ b/src/librivet/rivetWWW.c
@@ -95,8 +95,8 @@
 
     /* for all the characters in the source string */
     for (origStringP = origString, newStringP = newString;
-	        *origStringP != '\0';
-	        origStringP++) {
+                                    *origStringP != '\0';
+                                     origStringP++) {
 
         char c = *origStringP;
         char c2;
@@ -107,7 +107,7 @@
              continue;
         }
 
-             /* if there's a percent sign, decode the two-character
+         /* if there's a percent sign, decode the two-character
           * hex sequence that follows and copy it to the target
           * string */
         if (c == '%') {
@@ -123,14 +123,17 @@
                 return TCL_ERROR;
             }
 
-             *newStringP++ = (digit1 * 16 + digit2);
-             continue;
-         }
+            *newStringP++ = (digit1 * 16 + digit2);
+            continue;
+        }
 
-             /* it wasn't a plus or percent, just copy the char across */
-         *newStringP++ = c;
+        /* it wasn't a plus or percent, just copy the char across */
+
+        *newStringP++ = c;
     }
+
     /* Don't forget to null-terminate the target string */
+
     *newStringP = '\0';
 
     Tcl_SetObjResult( interp, Tcl_NewStringObj( newString, -1 ) );