diff --git a/app/exiv2.cpp b/app/exiv2.cpp
index c4f7dd19..cef78b55 100644
--- a/app/exiv2.cpp
+++ b/app/exiv2.cpp
@@ -749,9 +749,8 @@ int Params::evalDelete(const std::string& optArg) {
       if (rc > 0) {
         target_ |= static_cast<CommonTarget>(rc);
         return 0;
-      } else {
-        return 1;
       }
+      return 1;
     }
     default:
       std::cerr << progname() << ": " << _("Option -d is not compatible with a previous option\n");
@@ -771,9 +770,8 @@ int Params::evalExtract(const std::string& optArg) {
       if (rc > 0) {
         target_ |= static_cast<CommonTarget>(rc);
         return 0;
-      } else {
-        return 1;
       }
+      return 1;
     }
     default:
       std::cerr << progname() << ": " << _("Option -e is not compatible with a previous option\n");
@@ -793,9 +791,8 @@ int Params::evalInsert(const std::string& optArg) {
       if (rc > 0) {
         target_ |= static_cast<CommonTarget>(rc);
         return 0;
-      } else {
-        return 1;
       }
+      return 1;
     }
     default:
       std::cerr << progname() << ": " << _("Option -i is not compatible with a previous option\n");
diff --git a/src/types.cpp b/src/types.cpp
index 1ec865e4..ff6bc48b 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -178,7 +178,8 @@ byte* Exiv2::DataBuf::data(size_t offset) {
 const byte* Exiv2::DataBuf::c_data(size_t offset) const {
   if (pData_.empty()) {
     return nullptr;
-  } else if (offset >= pData_.size()) {
+  }
+  if (offset >= pData_.size()) {
     throw std::out_of_range("Overflow in Exiv2::DataBuf::c_data");
   }
   return &pData_[offset];