diff --git a/src/kits/tracker/CountView.cpp b/src/kits/tracker/CountView.cpp
index f2dbf2b184..ca216095b6 100644
--- a/src/kits/tracker/CountView.cpp
+++ b/src/kits/tracker/CountView.cpp
@@ -34,6 +34,7 @@ All rights reserved.
 
 // defines the status area drawn in the bottom left corner of a Tracker window
 
+
 #include "CountView.h"
 
 #include <Application.h>
@@ -49,15 +50,20 @@ All rights reserved.
 #include "Utilities.h"
 
 
-const bigtime_t kBarberPoleDelay = 500000;
-
-
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "CountView"
 
+
+const bigtime_t kBarberPoleDelay = 500000;
+
+
+//	#pragma mark - BCountView
+
+
 BCountView::BCountView(BRect bounds, BPoseView* view)
-	: BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
-			B_PULSE_NEEDED | B_WILL_DRAW),
+	:
+	BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
+		B_PULSE_NEEDED | B_WILL_DRAW),
 	fLastCount(-1),
 	fPoseView(view),
 	fShowingBarberPole(false),
@@ -308,7 +314,7 @@ BCountView::MouseDown(BPoint)
 	window->Activate();
 	window->UpdateIfNeeded();
 
-	if (fPoseView->IsFilePanel() || !fPoseView->TargetModel())
+	if (fPoseView->IsFilePanel() || fPoseView->TargetModel() == NULL)
 		return;
 
 	if (!window->TargetModel()->IsRoot()) {
diff --git a/src/kits/tracker/CountView.h b/src/kits/tracker/CountView.h
index 451fdcd42f..52ad97ee2d 100644
--- a/src/kits/tracker/CountView.h
+++ b/src/kits/tracker/CountView.h
@@ -31,8 +31,8 @@ of Be Incorporated in the United States and other countries. Other brand product
 names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
-#ifndef __COUNT_VIEW__
-#define __COUNT_VIEW__
+#ifndef _COUNT_VIEW_H
+#define _COUNT_VIEW_H
 
 
 #include <String.h>
@@ -50,9 +50,9 @@ public:
 	BCountView(BRect, BPoseView*);
 	~BCountView();
 
-	virtual	void Draw(BRect);
-	virtual	void MouseDown(BPoint);
-	virtual	void AttachedToWindow();
+	virtual void Draw(BRect);
+	virtual void MouseDown(BPoint);
+	virtual void AttachedToWindow();
 	virtual void Pulse();
 	virtual void WindowActivated(bool active);
 
@@ -94,4 +94,5 @@ private:
 
 using namespace BPrivate;
 
-#endif
+
+#endif	// _COUNT_VIEW_H