diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 6d0003e..3bd541e 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -390,11 +390,11 @@
         Fortran::common::LanguageFeature::OpenMP);
   }
 
-  //-fpedantic
+  // -pedantic
   if (args.hasArg(clang::driver::options::OPT_pedantic)) {
     res.set_EnableConformanceChecks();
   }
-  // -std=f2018.  Current behaviour is same as -fpedantic
+  // -std=f2018 (currently this implies -pedantic)
   // TODO: Set proper options when more fortran standards
   // are supported.
   if (args.hasArg(clang::driver::options::OPT_std_EQ)) {
@@ -560,7 +560,6 @@
   if (frontendOptions.instrumentedParse_)
     fortranOptions.instrumentedParse = true;
 
-  // Set the standard
   if (enableConformanceChecks()) {
     fortranOptions.features.WarnOnAllNonstandard();
   }