@@ -387,7 +387,6 @@ def __init__(self, ax, cmap=None,
         self.outline = None
         self.patch = None
         self.dividers = None
-        # self.locator and self.formatter are properties...
         self.locator = None
         self.formatter = None
         self._manual_tick_data_values = None
@@ -447,7 +446,7 @@ def draw_all(self):
 
     def set_norm(self, norm):
         """
-        set the norm of the mappable associateed with this colorbar.
+        set the norm of the mappable associated with this colorbar.
         """
         self.mappable.set_norm(norm)
 
 
@@ -435,7 +435,7 @@ def test_colorbar_renorm():
     assert isinstance(cbar.locator, _ColorbarLogLocator)
     assert np.allclose(cbar.ax.yaxis.get_majorticklocs(),
                        np.logspace(-8, 5, 14))
-    # note that that set_norm reemoves the FixedLocator...
+    # note that set_norm removes the FixedLocator...
     assert np.isclose(cbar.vmin, z.min())
     cbar.set_ticks([1, 2, 3])
     assert isinstance(cbar.locator, FixedLocator)
@@ -449,7 +449,7 @@ def test_colorbar_renorm():
 
 
 def test_colorbar_format():
-    # make sure that format is passed properly....
+    # make sure that format is passed properly
     x, y = np.ogrid[-4:4:31j, -4:4:31j]
     z = 120000*np.exp(-x**2 - y**2)