diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..bbd91e972
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "algorithm": "cpp",
+        "xutility": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh
index 16cd96e32..212e2ae61 100644
--- a/src/OT/Color/COLR/COLR.hh
+++ b/src/OT/Color/COLR/COLR.hh
@@ -1754,7 +1754,7 @@ struct ClipList
       prev_offset = offset;
     }
 
-    //last one
+    // last one
     {
       ClipRecord record;
       record.startGlyphID = start_gid;
@@ -2407,7 +2407,7 @@ struct COLR
 
   bool downgrade_to_V0 (const hb_set_t &glyphset) const
   {
-    //no more COLRv1 glyphs, downgrade to version 0
+    // no more COLRv1 glyphs, downgrade to version 0
     for (const BaseGlyphPaintRecord& _ : get_baseglyphList ())
       if (glyphset.has (_.glyphId))
         return false;
@@ -2566,7 +2566,7 @@ struct COLR
 
     hb_barrier ();
 
-    //start version 1
+    // start version 1
     if (!c->serializer->allocate_size<void> (5 * HBUINT32::static_size)) return_trace (false);
     if (!colr_prime->serialize_V0 (c->serializer, version, base_it, layer_it)) return_trace (false);
 
diff --git a/src/OT/glyf/CompositeGlyph.hh b/src/OT/glyf/CompositeGlyph.hh
index e2ec4a80e..91380ff61 100644
--- a/src/OT/glyf/CompositeGlyph.hh
+++ b/src/OT/glyf/CompositeGlyph.hh
@@ -187,7 +187,7 @@ struct CompositeGlyphRecord
         // new point value has an int8 overflow
         hb_memcpy (out, this, len_before_val);
         
-        //update flags
+        // update flags
         CompositeGlyphRecord *o = reinterpret_cast<CompositeGlyphRecord *> (out);
         o->flags = flags | ARG_1_AND_2_ARE_WORDS;
         out += len_before_val;
@@ -413,7 +413,7 @@ struct CompositeGlyph
       source_comp_len += comp_len;
     }
 
-    //copy instructions if any
+    // copy instructions if any
     if (source_len > source_comp_len)
     {
       unsigned instr_len = source_len - source_comp_len;
diff --git a/src/OT/glyf/Glyph.hh b/src/OT/glyf/Glyph.hh
index 2c289d511..6a7d3ea7d 100644
--- a/src/OT/glyf/Glyph.hh
+++ b/src/OT/glyf/Glyph.hh
@@ -156,7 +156,7 @@ struct Glyph
     if (hori_aw < 0) hori_aw = 0;
     int lsb = roundf (xMin - leftSideX);
     plan->hmtx_map.set_with_hash (new_gid, hash, hb_pair ((unsigned) hori_aw, lsb));
-    //flag value should be computed using non-empty glyphs
+    // flag value should be computed using non-empty glyphs
     if (type != EMPTY && lsb != xMin)
       plan->head_maxp_info.allXMinIsLsb = false;
 
@@ -265,7 +265,7 @@ struct Glyph
       dest_end = hb_bytes_t ();
     }
 
-    //dont compile bytes when pinned at default, just recalculate bounds
+    // dont compile bytes when pinned at default, just recalculate bounds
     if (!plan->pinned_at_default)
     {
       switch (type)
diff --git a/src/fontations/lib.rs b/src/fontations/lib.rs
index 3082b29e1..c749ebfd9 100644
--- a/src/fontations/lib.rs
+++ b/src/fontations/lib.rs
@@ -281,7 +281,7 @@ extern "C" fn _hb_fontations_get_glyph_v_advances(
     _user_data: *mut ::std::os::raw::c_void,
 ) {
     let data = unsafe { &mut *(font_data as *mut FontationsData) };
-    //data.check_for_updates();
+    // data.check_for_updates();
 
     // TODO: This doesn't apply VVAR variations; Skrifa doesn't have API
     // for this yet and it's tedious to do with read-fonts.
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 7d49710d1..28c5e2bc7 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -2735,7 +2735,7 @@ struct ContextFormat2_5
 
     if (!ret || non_zero_index == -1) return_trace (false);
 
-    //prune empty trailing ruleSets
+    // prune empty trailing ruleSets
     --index;
     while (index > non_zero_index)
     {
diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc
index 952ab3eb1..35ed889d6 100644
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
@@ -322,7 +322,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t                  &m,
     map->_1_mask = (1u << map->shift) & map->mask;
     map->needs_fallback = !found;
   }
-  //feature_infos.shrink (0); /* Done with these */
+  // feature_infos.shrink (0); /* Done with these */
   if (is_simple)
     m.features.qsort ();
 
diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh
index c00d22b24..857cc762f 100644
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
@@ -196,7 +196,7 @@ struct OS2
     }
     else
     {
-      if (a == b && a == 12) return 9.0f; //200
+      if (a == b && a == 12) return 9.0f; // 200
       b = 12;
       a = 8;
     }
diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 2d093f78b..f28cb1c3d 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -290,7 +290,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
   {
     if (plan->has_gpos_mark)
       // https://github.com/harfbuzz/harfbuzz/issues/653#issuecomment-423905920
-      //mode = HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
+      // mode = HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
       mode = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
     else
       mode = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
diff --git a/src/hb-ot-shaper-arabic.cc b/src/hb-ot-shaper-arabic.cc
index 44b670fcc..90461e90d 100644
--- a/src/hb-ot-shaper-arabic.cc
+++ b/src/hb-ot-shaper-arabic.cc
@@ -246,7 +246,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
    * Note that IranNastaliq uses this feature extensively
    * to fixup broken glyph sequences.  Oh well...
    * Test case: U+0643,U+0640,U+0631. */
-  //map->enable_feature (HB_TAG('c','s','w','h'), F_MANUAL_ZWJ);
+  // map->enable_feature (HB_TAG('c','s','w','h'), F_MANUAL_ZWJ);
   map->enable_feature (HB_TAG('m','s','e','t'), F_MANUAL_ZWJ);
 }
 
diff --git a/src/hb-ot-var-avar-table.hh b/src/hb-ot-var-avar-table.hh
index 75ea338e2..a3911bd23 100644
--- a/src/hb-ot-var-avar-table.hh
+++ b/src/hb-ot-var-avar-table.hh
@@ -363,7 +363,7 @@ struct avar
   {
     TRACE_SUBSET (this);
     unsigned retained_axis_count = c->plan->axes_index_map.get_population ();
-    if (!retained_axis_count) //all axes are pinned/dropped
+    if (!retained_axis_count) // all axes are pinned/dropped
       return_trace (false);
 
     avar *out = c->serializer->allocate_min<avar> ();
diff --git a/src/hb-ot-var-fvar-table.hh b/src/hb-ot-var-fvar-table.hh
index 2cd9afbb7..0e8bd2560 100644
--- a/src/hb-ot-var-fvar-table.hh
+++ b/src/hb-ot-var-fvar-table.hh
@@ -141,7 +141,7 @@ struct InstanceRecord
   HBUINT16	flags;		/* Reserved for future use — set to 0. */
   UnsizedArrayOf<F16DOT16>
 		coordinatesZ;	/* The coordinates array for this instance. */
-  //NameID	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
+  // NameID	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
   //				  * table that provide PostScript names for this
   //				  * instance. */
 
diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index c6532ad5e..b63b063de 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -315,7 +315,7 @@ struct cff_font_dict_op_serializer_t : op_serializer_t
       /* Faster than hb_memcpy for small strings. */
       for (unsigned i = 0; i < opstr.length; i++)
 	d[i] = opstr.ptr[i];
-      //hb_memcpy (d, opstr.ptr, opstr.length);
+      // hb_memcpy (d, opstr.ptr, opstr.length);
     }
     return_trace (true);
   }
diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc
index 2f0b54f47..2c42437eb 100644
--- a/src/hb-subset-input.cc
+++ b/src/hb-subset-input.cc
@@ -78,7 +78,7 @@ hb_subset_input_t::hb_subset_input_t ()
   sets.no_subset_tables->add_array (default_no_subset_tables,
 					 ARRAY_LENGTH (default_no_subset_tables));
 
-  //copied from _layout_features_groups in fonttools
+  // copied from _layout_features_groups in fonttools
   hb_tag_t default_layout_features[] = {
     // default shaper
     // common
@@ -90,54 +90,54 @@ hb_subset_input_t::hb_subset_input_t ()
     HB_TAG ('m', 'k', 'm', 'k'),
     HB_TAG ('r', 'l', 'i', 'g'),
 
-    //fractions
+    // fractions
     HB_TAG ('f', 'r', 'a', 'c'),
     HB_TAG ('n', 'u', 'm', 'r'),
     HB_TAG ('d', 'n', 'o', 'm'),
 
-    //horizontal
+    // horizontal
     HB_TAG ('c', 'a', 'l', 't'),
     HB_TAG ('c', 'l', 'i', 'g'),
     HB_TAG ('c', 'u', 'r', 's'),
     HB_TAG ('k', 'e', 'r', 'n'),
     HB_TAG ('r', 'c', 'l', 't'),
 
-    //vertical
+    // vertical
     HB_TAG ('v', 'a', 'l', 't'),
     HB_TAG ('v', 'e', 'r', 't'),
     HB_TAG ('v', 'k', 'r', 'n'),
     HB_TAG ('v', 'p', 'a', 'l'),
     HB_TAG ('v', 'r', 't', '2'),
 
-    //ltr
+    // ltr
     HB_TAG ('l', 't', 'r', 'a'),
     HB_TAG ('l', 't', 'r', 'm'),
 
-    //rtl
+    // rtl
     HB_TAG ('r', 't', 'l', 'a'),
     HB_TAG ('r', 't', 'l', 'm'),
 
-    //random
+    // random
     HB_TAG ('r', 'a', 'n', 'd'),
 
-    //justify
+    // justify
     HB_TAG ('j', 'a', 'l', 't'), // HarfBuzz doesn't use; others might
 
-    //East Asian spacing
+    // East Asian spacing
     HB_TAG ('c', 'h', 'w', 's'),
     HB_TAG ('v', 'c', 'h', 'w'),
     HB_TAG ('h', 'a', 'l', 't'),
     HB_TAG ('v', 'h', 'a', 'l'),
 
-    //private
+    // private
     HB_TAG ('H', 'a', 'r', 'f'),
     HB_TAG ('H', 'A', 'R', 'F'),
     HB_TAG ('B', 'u', 'z', 'z'),
     HB_TAG ('B', 'U', 'Z', 'Z'),
 
-    //shapers
+    // shapers
 
-    //arabic
+    // arabic
     HB_TAG ('i', 'n', 'i', 't'),
     HB_TAG ('m', 'e', 'd', 'i'),
     HB_TAG ('f', 'i', 'n', 'a'),
@@ -149,18 +149,18 @@ hb_subset_input_t::hb_subset_input_t ()
     HB_TAG ('m', 's', 'e', 't'),
     HB_TAG ('s', 't', 'c', 'h'),
 
-    //hangul
+    // hangul
     HB_TAG ('l', 'j', 'm', 'o'),
     HB_TAG ('v', 'j', 'm', 'o'),
     HB_TAG ('t', 'j', 'm', 'o'),
 
-    //tibetan
+    // tibetan
     HB_TAG ('a', 'b', 'v', 's'),
     HB_TAG ('b', 'l', 'w', 's'),
     HB_TAG ('a', 'b', 'v', 'm'),
     HB_TAG ('b', 'l', 'w', 'm'),
 
-    //indic
+    // indic
     HB_TAG ('n', 'u', 'k', 't'),
     HB_TAG ('a', 'k', 'h', 'n'),
     HB_TAG ('r', 'p', 'h', 'f'),
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index c88fd75a5..ced2965c7 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -241,7 +241,7 @@ _GSUBGPOS_find_duplicate_features (const OT::GSUBGPOS &g,
 {
   if (feature_indices->is_empty ()) return;
   hb_hashmap_t<hb_tag_t, hb::unique_ptr<hb_set_t>> unique_features;
-  //find out duplicate features after subset
+  // find out duplicate features after subset
   for (unsigned i : feature_indices->iter ())
   {
     hb_tag_t t = g.get_feature_tag (i);
@@ -564,7 +564,7 @@ static void _colr_closure (hb_subset_plan_t* plan,
 
   glyphs_colred->union_ (glyphset_colrv0);
 
-  //closure for COLRv1
+  // closure for COLRv1
   hb_set_t variation_indices, delta_set_indices;
   colr.closure_forV1 (glyphs_colred, &layer_indices, &palette_indices, &variation_indices, &delta_set_indices);
 
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index 214ea9341..0edaf5c28 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -173,7 +173,7 @@ struct hb_subset_plan_t
 #include "hb-subset-plan-member-list.hh"
 #undef HB_SUBSET_PLAN_MEMBER
 
-  //recalculated head/maxp table info after instancing
+  // recalculated head/maxp table info after instancing
   mutable head_maxp_info_t head_maxp_info;
 
   os2_info_t os2_info;
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index 1b8ac367e..ae797ce88 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -684,7 +684,7 @@ retry:
   int item_count;
 
   /* MinGW32 doesn't define fMergeNeutralItems, so we bruteforce */
-  //bidi_control.fMergeNeutralItems = true;
+  // bidi_control.fMergeNeutralItems = true;
   *(uint32_t*)&bidi_control |= 1u<<24;
 
   bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;