diff --git a/src/kits/tracker/StatusWindow.cpp b/src/kits/tracker/StatusWindow.cpp
index b8ee82ad38..9b770dc116 100644
--- a/src/kits/tracker/StatusWindow.cpp
+++ b/src/kits/tracker/StatusWindow.cpp
@@ -58,7 +58,11 @@ All rights reserved.
 #include "DeskWindow.h"
 
 
-const float	kDefaultStatusViewHeight = 50;
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "StatusWindow"
+
+
+const float kDefaultStatusViewHeight = 50;
 const bigtime_t kMaxUpdateInterval = 100000LL;
 const bigtime_t kSpeedReferenceInterval = 2000000LL;
 const bigtime_t kShowSpeedInterval = 8000000LL;
@@ -69,6 +73,7 @@ static bigtime_t sLastEstimatedFinishSpeedToggleTime = -1;
 static bool sShowSpeed = true;
 static const time_t kSecondsPerDay = 24 * 60 * 60;
 
+
 class TCustomButton : public BButton {
 public:
 								TCustomButton(BRect frame, uint32 command);
@@ -90,6 +95,9 @@ BStatusWindow* gStatusWindow = NULL;
 }
 
 
+//	#pragma mark - BStatusMouseFilter
+
+
 BStatusMouseFilter::BStatusMouseFilter()
 	:
 	BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, B_MOUSE_DOWN)
@@ -115,6 +123,9 @@ BStatusMouseFilter::Filter(BMessage* message, BHandler** target)
 }
 
 
+//	#pragma mark - TCustomButton
+
+
 TCustomButton::TCustomButton(BRect frame, uint32 what)
 	:
 	BButton(frame, "", "", new BMessage(what), B_FOLLOW_LEFT | B_FOLLOW_TOP,
@@ -154,13 +165,14 @@ TCustomButton::Draw(BRect updateRect)
 }
 
 
-// #pragma mark -
+// #pragma mark - StatusBackgroundView
 
 
 class StatusBackgroundView : public BView {
 public:
 	StatusBackgroundView(BRect frame)
-		: BView(frame, "BackView", B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED)
+		:
+		BView(frame, "BackView", B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED)
 	{
 		SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	}
@@ -183,11 +195,7 @@ public:
 };
 
 
-// #pragma mark - BStatusWindow
-
-
-#undef B_TRANSLATION_CONTEXT
-#define B_TRANSLATION_CONTEXT "StatusWindow"
+//	#pragma mark - BStatusWindow
 
 
 BStatusWindow::BStatusWindow()
@@ -611,9 +619,6 @@ BStatusView::InitStatus(int32 totalItems, off_t totalSize,
 		case kRestoreFromTrashState:
 			fStatusBar->Reset(B_TRANSLATE("Restoring: "), buffer.String());
 			break;
-
-		default:
-			break;
 	}
 
 	fStatusBar->SetMaxValue(1);
@@ -756,6 +761,7 @@ BStatusView::_FullSpeedString()
 		buffer.ReplaceFirst("%BytesPerSecond",
 			string_for_size(fBytesPerSecond, sizeBuffer, sizeof(sizeBuffer)));
 	}
+
 	return buffer;
 }
 
@@ -770,6 +776,7 @@ BStatusView::_ShortSpeedString()
 		buffer.ReplaceFirst("%BytesPerSecond",
 			string_for_size(fBytesPerSecond, sizeBuffer, sizeof(sizeBuffer)));
 	}
+
 	return buffer;
 }
 
@@ -804,6 +811,7 @@ BStatusView::_TimeStatusString(float availableSpace, float* _width)
 
 	if (_width != NULL)
 		*_width = width;
+
 	return string;
 }
 
diff --git a/src/kits/tracker/StatusWindow.h b/src/kits/tracker/StatusWindow.h
index 4f8af426fa..2341bf3bbb 100644
--- a/src/kits/tracker/StatusWindow.h
+++ b/src/kits/tracker/StatusWindow.h
@@ -31,17 +31,16 @@ 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 STATUS_WINDOW_H
-#define STATUS_WINDOW_H
+#ifndef _STATUS_WINDOW_H
+#define _STATUS_WINDOW_H
 
 
-#include <Window.h>
-#include <View.h>
 #include <Bitmap.h>
+#include <ObjectList.h>
 #include <StatusBar.h>
 #include <String.h>
-
-#include "ObjectList.h"
+#include <View.h>
+#include <Window.h>
 
 
 namespace BPrivate {
@@ -204,4 +203,4 @@ extern BStatusWindow* gStatusWindow;
 using namespace BPrivate;
 
 
-#endif // STATUS_WINDOW_H
+#endif // _STATUS_WINDOW_H