diff --git a/libs/canvas/canvas/tracking_text.h b/libs/canvas/canvas/tracking_text.h
index 6884fdf296..252f30fa30 100644
--- a/libs/canvas/canvas/tracking_text.h
+++ b/libs/canvas/canvas/tracking_text.h
@@ -20,31 +20,31 @@
 #ifndef __ardour_canvas_tracking_text_h__
 #define __ardour_canvas_tracking_text_h__
 
-#include <string>
 #include "canvas/text.h"
+#include <string>
 
 namespace ArdourCanvas {
 
 class LIBCANVAS_API TrackingText : public Text
 {
-  public:
+public:
 	TrackingText (Canvas*);
 	TrackingText (Item*);
 
 	void show_and_track (bool track_x, bool track_y);
-	void set_offset (Duple const &);
+	void set_offset (Duple const&);
 	void set_x_offset (double);
 	void set_y_offset (double);
 
-  private:
-	bool track_x;
-	bool track_y;
+private:
+	bool  track_x;
+	bool  track_y;
 	Duple offset;
 
 	void pointer_motion (Duple const&);
 	void init ();
 };
 
-}
+} // namespace ArdourCanvas
 
 #endif /* __ardour_canvas_tracking_text_h__ */
diff --git a/libs/canvas/tracking_text.cc b/libs/canvas/tracking_text.cc
index 040d81d3e4..f8f246c403 100644
--- a/libs/canvas/tracking_text.cc
+++ b/libs/canvas/tracking_text.cc
@@ -51,7 +51,7 @@ TrackingText::init ()
 }
 
 void
-TrackingText::pointer_motion (Duple const & winpos)
+TrackingText::pointer_motion (Duple const& winpos)
 {
 	if (!_visible) {
 		return;
@@ -60,18 +60,18 @@ TrackingText::pointer_motion (Duple const & winpos)
 	Duple pos (_parent->window_to_item (winpos));
 
 	if (!track_x) {
-		pos.x = position().x;
+		pos.x = position ().x;
 	}
 
 	if (!track_y) {
-		pos.y = position().y;
+		pos.y = position ().y;
 	}
 
 	pos = pos.translate (offset);
 
 	/* keep inside the window */
 
-	Rect r (0, 0, _canvas->width(), _canvas->height());
+	Rect r (0, 0, _canvas->width (), _canvas->height ());
 
 	/* border of 200 pixels on the right, and 50 on all other sides */
 
@@ -128,23 +128,23 @@ TrackingText::show_and_track (bool tx, bool ty)
 void
 TrackingText::set_x_offset (double o)
 {
-        begin_change ();
+	begin_change ();
 	offset.x = o;
-        end_change ();
+	end_change ();
 }
 
 void
 TrackingText::set_y_offset (double o)
 {
-        begin_change ();
+	begin_change ();
 	offset.y = o;
-        end_change ();
+	end_change ();
 }
 
 void
-TrackingText::set_offset (Duple const & d)
+TrackingText::set_offset (Duple const& d)
 {
-        begin_change ();
+	begin_change ();
 	offset = d;
-        end_change ();
+	end_change ();
 }