diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index a7c3aca3cf23b63c842d3849a09df88537978d68..dc48fa4b02c78541ccd2559cc5177e6492a4b3d6 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -61,8 +61,8 @@ static const nmv_context default_nmv_context = {
         { { 0 }, { 0 } },  // class0_fp_cdf is computed in av1_init_mv_probs()
         { 0 },             // fp_cdf is computed from fp in av1_init_mv_probs()
 #endif
-        160,                                                   // class0_hp bit
-        128,                                                   // hp
+        160,  // class0_hp bit
+        128,  // hp
     },
     {
         // Horizontal component
@@ -79,8 +79,8 @@ static const nmv_context default_nmv_context = {
         { { 0 }, { 0 } },  // class0_fp_cdf is computed in av1_init_mv_probs()
         { 0 },             // fp_cdf is computed from fp in av1_init_mv_probs()
 #endif
-        160,                                                   // class0_hp bit
-        128,                                                   // hp
+        160,  // class0_hp bit
+        128,  // hp
     } },
 };
 
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index fb50f2d2ae44f0ba09e3261ad59d9b9636321e62..f85ba6decb3e2843f5e209ec618b53a98f34307c 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -568,7 +568,7 @@ static int read_mv_component(aom_reader *r, const nmv_component *mvcomp,
     mag = CLASS0_SIZE << (mv_class + 2);
   }
 
-  // Fractional part
+// Fractional part
 #if CONFIG_DAALA_EC
   fr = aom_read_symbol(r, class0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
                        MV_FP_SIZE, ACCT_STR);
diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index f02f801694611a0bff1364fd94584be862f083cf..52ec267d6e6f4109303e7bfd506e090df0276b56 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -45,7 +45,7 @@ static void encode_mv_component(aom_writer *w, int comp,
   // Sign
   aom_write(w, sign, mvcomp->sign);
 
-  // Class
+// Class
 #if CONFIG_DAALA_EC
   aom_write_symbol(w, mv_class, mvcomp->class_cdf, MV_CLASSES);
 #else
@@ -62,7 +62,7 @@ static void encode_mv_component(aom_writer *w, int comp,
     for (i = 0; i < n; ++i) aom_write(w, (d >> i) & 1, mvcomp->bits[i]);
   }
 
-  // Fractional bits
+// Fractional bits
 #if CONFIG_DAALA_EC
   aom_write_symbol(
       w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,