diff --git a/Source/driver/Castro_util.H b/Source/driver/Castro_util.H
index b857e86a33..1b05c0cb84 100644
--- a/Source/driver/Castro_util.H
+++ b/Source/driver/Castro_util.H
@@ -71,17 +71,15 @@ bool mom_flux_has_p (const int mom_dir, const int flux_dir, const int coord)
 
         if (coord != CoordSys::cartesian) {
             return false;
-        } else {
-            return true;
         }
+        return true;
 
     } else if (mom_dir == 1 && flux_dir == 1) {
 
-        if (coord == CoordSys::spherical) {
+        if (coord == CoordSys::SPHERICAL) {
             return false;
-        } else {
-            return true
         }
+        return true
 
     } else {
         return (mom_dir == flux_dir);