--- a/extensions/gio/nsGIOProtocolHandler.cpp
+++ b/extensions/gio/nsGIOProtocolHandler.cpp
@@ -89,18 +89,17 @@ MapGIOResult(gint code)
   return NS_ERROR_FAILURE;
 }
 
 static nsresult
 MapGIOResult(GError *result)
 {
   if (!result)
     return NS_OK;
-  else 
-    return MapGIOResult(result->code);
+  return MapGIOResult(result->code);
 }
 /** Return values for mount operation.
  * These enums are used as mount operation return values.
  */
 typedef enum {
   MOUNT_OPERATION_IN_PROGRESS, /** \enum operation in progress */
   MOUNT_OPERATION_SUCCESS,     /** \enum operation successful */
   MOUNT_OPERATION_FAILED       /** \enum operation not successful */
@@ -232,27 +231,26 @@ nsGIOInputStream::MountVolume() {
      (not this thread on which this method is called). */
   g_file_mount_enclosing_volume(mHandle,
                                 G_MOUNT_MOUNT_NONE,
                                 mount_op,
                                 nullptr,
                                 mount_enclosing_volume_finished,
                                 this);
   mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
-  /* Waiting for finish of mount operation thread */  
+  /* Waiting for finish of mount operation thread */
   while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
     mon.Wait();
-  
+
   g_object_unref(mount_op);
 
   if (mMountRes == MOUNT_OPERATION_FAILED) {
     return MapGIOResult(mMountErrorCode);
-  } else {
-    return NS_OK;
   }
+  return NS_OK;
 }
 
 /**
  * Create list of infos about objects in opened directory
  * Return: NS_OK when list obtained, otherwise error code according
  * to failed operation.
  */
 nsresult
@@ -441,17 +439,17 @@ nsGIOInputStream::DoRead(char *aBuf, uin
       g_warning("Cannot read from file: %s", error->message);
       g_error_free(error);
       return rv;
     }
     *aCountRead = bytes_read;
     mBytesRemaining -= *aCountRead;
     return NS_OK;
   }
-  else if (mDirOpen) {
+  if (mDirOpen) {
     // directory read
     while (aCount && rv != NS_BASE_STREAM_CLOSED)
     {
       // Copy data out of our buffer
       uint32_t bufLen = mDirBuf.Length() - mDirBufCursor;
       if (bufLen)
       {
         uint32_t n = std::min(bufLen, aCount);