diff --git a/pkg/cloudprovider/providers/aws/aws_fakes.go b/pkg/cloudprovider/providers/aws/aws_fakes.go
index 28946fa35c..844a3a0c0a 100644
--- a/pkg/cloudprovider/providers/aws/aws_fakes.go
+++ b/pkg/cloudprovider/providers/aws/aws_fakes.go
@@ -353,10 +353,10 @@ func (m *FakeMetadata) GetMetadata(key string) (string, error) {
 			}
 		}
 
-		return "", nil
-	} else {
 		return "", nil
 	}
+
+	return "", nil
 }
 
 // FakeELB is a fake ELB client used for testing
diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go
index 070961c282..8f5f4f6ff6 100644
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -201,9 +201,9 @@ func PathExists(path string) (bool, error) {
 		return false, nil
 	} else if IsCorruptedMnt(err) {
 		return true, err
-	} else {
-		return false, err
 	}
+
+	return false, err
 }
 
 // IsCorruptedMnt return true if err is about corrupted mount point