diff --git a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
index e093c05d7..efe8d7826 100644
--- a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
+++ b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
@@ -82,8 +82,7 @@ Blockly.blockRendering.Highlighter.prototype.drawTopCorner = function(row) {
       this.steps_.push(this.notchPaths_.pathLeft);
       this.steps_.push('h',  (this.RTL_ ? -0.5 : 0.5));
     } else if (elem.type === 'hat') {
-      this.steps_.push(
-          this.startPaths_.path(this.RTL_));
+      this.steps_.push(this.startPaths_.path(this.RTL_));
     } else if (elem.isSpacer()) {
       this.steps_.push('h', elem.width - this.highlightOffset_);
     }
@@ -126,7 +125,6 @@ Blockly.blockRendering.Highlighter.prototype.drawStatementInput = function(row)
     var steps =
         Blockly.utils.svgPaths.moveTo(row.statementEdge, row.yPos + row.height) +
         this.insideCornerPaths_.pathBottom(this.RTL_);
-
     this.steps_.push(steps);
   }
 };
diff --git a/core/renderers/block_rendering_rewrite/block_rendering_constants.js b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
index ac921db75..0142fb5a5 100644
--- a/core/renderers/block_rendering_rewrite/block_rendering_constants.js
+++ b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
@@ -245,7 +245,6 @@ Blockly.blockRendering.constants.INSIDE_CORNERS = (function() {
       Blockly.utils.svgPaths.point(radius, radius));
 
   return {
-    //width: width,
     height: radius,
     pathTop: innerTopLeftCorner,
     pathBottom: innerBottomLeftCorner
@@ -267,8 +266,6 @@ Blockly.blockRendering.constants.OUTSIDE_CORNERS = (function() {
       Blockly.utils.svgPaths.point(-radius, -radius));
 
   return {
-    // width: width,
-    // height: height,
     topLeft: topLeft,
     bottomLeft: bottomLeft
   };
diff --git a/core/renderers/block_rendering_rewrite/highlight_constants.js b/core/renderers/block_rendering_rewrite/highlight_constants.js
index b134b6661..59a222dbd 100644
--- a/core/renderers/block_rendering_rewrite/highlight_constants.js
+++ b/core/renderers/block_rendering_rewrite/highlight_constants.js
@@ -19,7 +19,7 @@
  */
 
 /**
- * @fileoverview Methods for graphically rendering a block as SVG.
+ * @fileoverview Objects for rendering highlights on blocks.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
diff --git a/core/renderers/block_rendering_rewrite/measurables.js b/core/renderers/block_rendering_rewrite/measurables.js
index 95f32c899..be247d114 100644
--- a/core/renderers/block_rendering_rewrite/measurables.js
+++ b/core/renderers/block_rendering_rewrite/measurables.js
@@ -351,7 +351,6 @@ goog.inherits(Blockly.blockRendering.Hat, Blockly.blockRendering.Measurable);
 Blockly.blockRendering.SquareCorner = function() {
   Blockly.blockRendering.SquareCorner.superClass_.constructor.call(this);
   this.type = 'square corner';
-  // TODO: Is this the right height?
   this.height = Blockly.blockRendering.constants.NOTCH.height;
   this.width = Blockly.blockRendering.constants.NO_PADDING;
 
@@ -370,7 +369,6 @@ Blockly.blockRendering.RoundCorner = function() {
   this.width = Blockly.blockRendering.constants.CORNER_RADIUS;
   // The rounded corner extends into the next row by 4 so we only take the
   // height that is aligned with this row.
-  // TODO: Investigate.
   this.height = Blockly.blockRendering.constants.NOTCH.height;
 
 };