diff --git a/ChangeLog b/ChangeLog
index 768d45fa..d002ed40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Code cleanup
+	* src/DownloadCommand.cc
+
 2009-04-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed segmentation fault when GZipDecoder::decode() returns 0
diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc
index c47f0f8f..8b6b05ac 100644
--- a/src/DownloadCommand.cc
+++ b/src/DownloadCommand.cc
@@ -172,22 +172,11 @@ bool DownloadCommand::executeInternal() {
 	      !socket->wantRead() && !socket->wantWrite()) {
       segmentComplete = true;
     }
-  } else if(!_transferEncodingDecoder.isNull() &&
-	    !_contentEncodingDecoder.isNull()) {
-    if(_transferEncodingDecoder->finished() &&
-       _contentEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
-  } else if(!_transferEncodingDecoder.isNull() &&
-	    _contentEncodingDecoder.isNull()) {
-    if(_transferEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
-  } else if(_transferEncodingDecoder.isNull() &&
-	    !_contentEncodingDecoder.isNull()) {
-    if(_contentEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
+  } else if((_transferEncodingDecoder.isNull() ||
+	     _transferEncodingDecoder->finished()) &&
+	    (_contentEncodingDecoder.isNull() ||
+	     _contentEncodingDecoder->finished())) {
+    segmentComplete = true;
   }
 
   if(!segmentComplete && bufSize == 0 &&