diff --git a/ChangeLog b/ChangeLog
index 1e2923f8..b95253b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-06  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Code cleanup
+	* src/Base64.cc (encode)
+
 2007-12-06  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Changed Direct/IO enable/disable procesure in file allocation routine.
diff --git a/src/Base64.cc b/src/Base64.cc
index a16bdc6e..7cd87025 100644
--- a/src/Base64.cc
+++ b/src/Base64.cc
@@ -89,13 +89,14 @@ void Base64::encode(unsigned char*& result, size_t& rlength,
     *p++ = CHAR_TABLE[n&0x3f];
   }
   if(r == 2) {
-    int n = (*s << 16)+(*(s+1) << 8);
+    int n = *s++ << 16;
+    n += *s++ << 8;
     *p++ = CHAR_TABLE[n >> 18];
     *p++ = CHAR_TABLE[n >> 12&0x3f];
     *p++ = CHAR_TABLE[n >> 6&0x3f];
     *p++ = '=';
   } else if(r == 1) {
-    int n = (*s << 16);
+    int n = *s++ << 16;
     *p++ = CHAR_TABLE[n >> 18];
     *p++ = CHAR_TABLE[n >> 12&0x3f];
     *p++ = '=';