diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index 2647068..ffc1398 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -60,8 +61,6 @@ All rights reserved.
 #include "PublicCommands.h"
 #include "ResourceSet.h"
 #include "Switcher.h"
-#include "TeamMenu.h"
-#include "WindowMenuItem.h"
 
 
 BLocker TBarApp::sSubscriberLock;
@@ -72,8 +71,8 @@ BList TBarApp::sSubscribers;
 const uint32 kShowBeMenu = 'BeMn';
 const uint32 kShowTeamMenu = 'TmMn';
 
-const BRect kIconSize(0.0f, 0.0f, 15.0f, 15.0f);
 
+const BRect kIconRect(0.0f, 0.0f, 15.0f, 15.0f);
 static const color_space kIconFormat = B_RGBA32;
 
 
@@ -190,26 +189,19 @@ TBarApp::SaveSettings()
 		storedSettings.AddFloat("width", fSettings.width);
 		storedSettings.AddBool("showTime", fSettings.showTime);
 		storedSettings.AddPoint("switcherLoc", fSettings.switcherLoc);
-		storedSettings.AddInt32("recentAppsCount",
-			fSettings.recentAppsCount);
-		storedSettings.AddInt32("recentDocsCount",
-			fSettings.recentDocsCount);
-		storedSettings.AddBool("timeShowSeconds",
-			fSettings.timeShowSeconds);
+		storedSettings.AddInt32("recentAppsCount", fSettings.recentAppsCount);
+		storedSettings.AddInt32("recentDocsCount", fSettings.recentDocsCount);
+		storedSettings.AddBool("timeShowSeconds", fSettings.timeShowSeconds);
 		storedSettings.AddInt32("recentFoldersCount",
 			fSettings.recentFoldersCount);
 		storedSettings.AddBool("alwaysOnTop", fSettings.alwaysOnTop);
 		storedSettings.AddBool("timeFullDate", fSettings.timeFullDate);
 		storedSettings.AddBool("trackerAlwaysFirst",
 			fSettings.trackerAlwaysFirst);
-		storedSettings.AddBool("sortRunningApps",
-			fSettings.sortRunningApps);
-		storedSettings.AddBool("superExpando",
-			fSettings.superExpando);
-		storedSettings.AddBool("expandNewTeams",
-			fSettings.expandNewTeams);
-		storedSettings.AddBool("autoRaise",
-			fSettings.autoRaise);
+		storedSettings.AddBool("sortRunningApps", fSettings.sortRunningApps);
+		storedSettings.AddBool("superExpando", fSettings.superExpando);
+		storedSettings.AddBool("expandNewTeams", fSettings.expandNewTeams);
+		storedSettings.AddBool("autoRaise", fSettings.autoRaise);
 		storedSettings.AddBool("recentAppsEnabled",
 			fSettings.recentAppsEnabled);
 		storedSettings.AddBool("recentDocsEnabled",
@@ -291,12 +283,9 @@ TBarApp::InitSettings()
 				&settings.trackerAlwaysFirst);
 			storedSettings.FindBool("sortRunningApps",
 				&settings.sortRunningApps);
-			storedSettings.FindBool("superExpando",
-				&settings.superExpando);
-			storedSettings.FindBool("expandNewTeams",
-				&settings.expandNewTeams);
-			storedSettings.FindBool("autoRaise",
-				&settings.autoRaise);
+			storedSettings.FindBool("superExpando", &settings.superExpando);
+			storedSettings.FindBool("expandNewTeams", &settings.expandNewTeams);
+			storedSettings.FindBool("autoRaise", &settings.autoRaise);
 			storedSettings.FindBool("recentAppsEnabled",
 				&settings.recentAppsEnabled);
 			storedSettings.FindBool("recentDocsEnabled",
@@ -313,8 +302,6 @@ TBarApp::InitSettings()
 void
 TBarApp::MessageReceived(BMessage* message)
 {
-	int32 count;
-	bool enabled;
 	switch (message->what) {
 		case 'gloc':
 		case 'sloc':
@@ -353,6 +340,9 @@ TBarApp::MessageReceived(BMessage* message)
 			break;
 
 		case kUpdateRecentCounts:
+			int32 count;
+			bool enabled;
+
 			if (message->FindInt32("applications", &count) == B_OK)
 				fSettings.recentAppsCount = count;
 			if (message->FindBool("applicationsEnabled", &enabled) == B_OK)
@@ -413,44 +403,35 @@ TBarApp::MessageReceived(BMessage* message)
 			break;
 
 		case kAlwaysTop:
- 			fSettings.alwaysOnTop = !fSettings.alwaysOnTop;
+			fSettings.alwaysOnTop = !fSettings.alwaysOnTop;
 
- 			fBarWindow->SetFeel(fSettings.alwaysOnTop ?
- 				B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
- 			break;
+			fBarWindow->SetFeel(fSettings.alwaysOnTop ?
+				B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
+			break;
 
 		case kAutoRaise:
-		{
 			fSettings.autoRaise = !fSettings.autoRaise;
 
-			TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
 			fBarWindow->Lock();
-			barView->UpdateAutoRaise();
+			BarView()->UpdateAutoRaise();
 			fBarWindow->Unlock();
 			break;
-		}
 
 		case kTrackerFirst:
-		{
 			fSettings.trackerAlwaysFirst = !fSettings.trackerAlwaysFirst;
 
-			TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
 			fBarWindow->Lock();
-			barView->UpdatePlacement();
+			BarView()->UpdatePlacement();
 			fBarWindow->Unlock();
 			break;
-		}
 
 		case kSortRunningApps:
-		{
 			fSettings.sortRunningApps = !fSettings.sortRunningApps;
 
-			TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
 			fBarWindow->Lock();
-			barView->UpdatePlacement();
+			BarView()->UpdatePlacement();
 			fBarWindow->Unlock();
 			break;
-		}
 
 		case kUnsubscribe:
 		{
@@ -461,26 +442,20 @@ TBarApp::MessageReceived(BMessage* message)
 		}
 
 		case kSuperExpando:
-		{
 			fSettings.superExpando = !fSettings.superExpando;
 
-			TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
 			fBarWindow->Lock();
-			barView->UpdatePlacement();
+			BarView()->UpdatePlacement();
 			fBarWindow->Unlock();
 			break;
-		}
 
 		case kExpandNewTeams:
-		{
 			fSettings.expandNewTeams = !fSettings.expandNewTeams;
 
-			TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
 			fBarWindow->Lock();
-			barView->UpdatePlacement();
+			BarView()->UpdatePlacement();
 			fBarWindow->Unlock();
 			break;
-		}
 
 		case 'TASK':
 			fSwitcherMessenger.SendMessage(message);
@@ -636,7 +611,7 @@ TBarApp::AddTeam(team_id team, uint32 flags, const char* sig, entry_ref* ref)
 	BAppFileInfo appMime(&file);
 
 	BarTeamInfo* barInfo = new BarTeamInfo(new BList(), flags, strdup(sig),
-		new BBitmap(kIconSize, kIconFormat), strdup(ref->name));
+		new BBitmap(kIconRect, kIconFormat), strdup(ref->name));
 
 	barInfo->teams->AddItem((void*)team);
 	if (appMime.GetIcon(barInfo->icon, B_MINI_ICON) != B_OK)
@@ -682,7 +657,7 @@ TBarApp::RemoveTeam(team_id team)
 			int32 subsCount = sSubscribers.CountItems();
 			if (subsCount > 0) {
 				BMessage message((barInfo->teams->CountItems() == 1) ?
-					 B_SOME_APP_QUIT : kRemoveTeam);
+					B_SOME_APP_QUIT : kRemoveTeam);
 
 				message.AddInt32("team", team);
 				for (int32 i = 0; i < subsCount; i++) {
@@ -706,7 +681,7 @@ TBarApp::ShowPreferencesWindow()
 {
 	if (fPreferencesWindow)
 		fPreferencesWindow->Activate();
- 	else {
+	else {
 		fPreferencesWindow = new PreferencesWindow(BRect(0, 0, 320, 240));
 		fPreferencesWindow->Show();
 	}
diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h
index 6f15838..c3fd47b 100644
--- a/src/apps/deskbar/BarApp.h
+++ b/src/apps/deskbar/BarApp.h
@@ -141,7 +141,7 @@ class TBarApp : public BApplication {
 		static void Unsubscribe(const BMessenger &subscriber);
 
 	private:
-		void AddTeam(team_id team, uint32 flags, const char	*sig, entry_ref	*);
+		void AddTeam(team_id team, uint32 flags, const char	*sig, entry_ref*);
 		void RemoveTeam(team_id);
 
 		void InitSettings();
diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp
index b246eb3..333e06a 100644
--- a/src/apps/deskbar/BarMenuBar.cpp
+++ b/src/apps/deskbar/BarMenuBar.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -78,7 +79,7 @@ TBarMenuBar::SmartResize(float width, float height)
 		BRect frame = Frame();
 		width = frame.Width();
 		height = frame.Height();
-	} else 
+	} else
 		ResizeTo(width, height);
 
 	width -= 1;
@@ -96,7 +97,7 @@ TBarMenuBar::SmartResize(float width, float height)
 void
 TBarMenuBar::AddTeamMenu()
 {
-	if (CountItems() > 1) 
+	if (CountItems() > 1)
 		return;
 
 	BRect frame(Frame());
@@ -112,7 +113,7 @@ TBarMenuBar::AddTeamMenu()
 void
 TBarMenuBar::RemoveTeamMenu()
 {
-	if (CountItems() < 2) 
+	if (CountItems() < 2)
 		return;
 
 	if (fAppListMenuItem) {
@@ -121,7 +122,7 @@ TBarMenuBar::RemoveTeamMenu()
 		fAppListMenuItem = NULL;
 	}
 
-	BRect frame = Frame();	
+	BRect frame = Frame();
 	SmartResize(frame.Width(), frame.Height());
 }
 
@@ -179,9 +180,10 @@ init_tracking_hook(BMenuItem* item, bool (*hookFunction)(BMenu*, void*),
 		return;
 
 	BMenu* windowMenu = item->Submenu();
-	if (windowMenu) 
-		//	have a menu, set the tracking hook
-		windowMenu->SetTrackingHook(hookFunction, state);					
+	if (windowMenu) {
+		// have a menu, set the tracking hook
+		windowMenu->SetTrackingHook(hookFunction, state);
+	}
 }
 
 
@@ -192,13 +194,13 @@ TBarMenuBar::InitTrackingHook(bool (*hookFunction)(BMenu*, void*),
 	BPoint loc;
 	uint32 buttons;
 	GetMouse(&loc, &buttons);
-	//	set the hook functions for the two menus
-	//	will always have the be menu
-	//	may have the app menu as well (mini mode)
-	if (fBeMenuItem->Frame().Contains(loc) || both) 
+	// set the hook functions for the two menus
+	// will always have the be menu
+	// may have the app menu as well (mini mode)
+	if (fBeMenuItem->Frame().Contains(loc) || both)
 		init_tracking_hook(fBeMenuItem, hookFunction, state);
 
-	if (fAppListMenuItem && (fAppListMenuItem->Frame().Contains(loc) || both)) 
+	if (fAppListMenuItem && (fAppListMenuItem->Frame().Contains(loc) || both))
 		init_tracking_hook(fAppListMenuItem, hookFunction, state);
 }
 
diff --git a/src/apps/deskbar/BarMenuBar.h b/src/apps/deskbar/BarMenuBar.h
index ef21df1..f748882 100644
--- a/src/apps/deskbar/BarMenuBar.h
+++ b/src/apps/deskbar/BarMenuBar.h
@@ -26,15 +26,16 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
-//	Be Menu, used in vertical mode, expanded and mini
-//		in mini mode will have team menu next to Be menu
-//		Be menu in horizontal mode is embedded in ExpandoMenuBar
+// Be Menu, used in vertical mode, expanded and mini
+//   - in mini mode will have team menu next to Be menu
+//   - Be menu in horizontal mode is embedded in ExpandoMenuBar
 
 #ifndef BARMENUBAR_H
 #define BARMENUBAR_H
@@ -63,7 +64,7 @@ class TBarMenuBar : public BMenuBar {
 
 		void InitTrackingHook(bool (* hookfunction)(BMenu*, void*), void* state,
 			bool both = false);
-	
+
 	private:
 		TBarView* fBarView;
 		TBarMenuTitle* fBeMenuItem;
diff --git a/src/apps/deskbar/BarMenuTitle.cpp b/src/apps/deskbar/BarMenuTitle.cpp
index df8b0d2..84c2d91 100644
--- a/src/apps/deskbar/BarMenuTitle.cpp
+++ b/src/apps/deskbar/BarMenuTitle.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -116,14 +117,14 @@ TBarMenuTitle::DrawContent()
 
 	if (be_control_look != NULL) {
 		menu->SetDrawingMode(B_OP_ALPHA);
-	
+
 		if (fIcon != NULL) {
 			BRect dstRect(fIcon->Bounds());
 			dstRect.OffsetTo(frame.LeftTop());
 			dstRect.OffsetBy(rintf(((frame.Width() - dstRect.Width()) / 2)
 				- 1.0f), rintf(((frame.Height() - dstRect.Height()) / 2)
 				- 0.0f));
-	
+
 			menu->DrawBitmapAsync(fIcon, dstRect);
 		}
 		return;
@@ -200,11 +201,11 @@ TBarMenuTitle::Invoke(BMessage* message)
 		BLooper* looper = barview->Looper();
 		if (looper->Lock()) {
 			// tell barview to add the refs to the be menu
-			barview->HandleBeMenu(NULL);			
+			barview->HandleBeMenu(NULL);
 			looper->Unlock();
 		}
 	}
-		
+
 	return BMenuItem::Invoke(message);
 }
 
diff --git a/src/apps/deskbar/BarMenuTitle.h b/src/apps/deskbar/BarMenuTitle.h
index be7aa99..543cc51 100644
--- a/src/apps/deskbar/BarMenuTitle.h
+++ b/src/apps/deskbar/BarMenuTitle.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -46,15 +47,15 @@ class BMenu;
 
 class TBarMenuTitle : public BMenuItem {
 public:
- 	TBarMenuTitle(float width,float height, const BBitmap* icon,
- 		BMenu* menu, bool inexpando = false);
+	TBarMenuTitle(float width, float height, const BBitmap* icon,
+		BMenu* menu, bool inexpando = false);
 	virtual ~TBarMenuTitle();
 
 	void SetWidthHeight(float width, float height);
 	void Draw();
 
 	status_t Invoke(BMessage* message);
-		
+
 protected:
 	void DrawContent();
 	void GetContentSize(float* width, float* height);
@@ -63,7 +64,7 @@ private:
 	float fWidth;
 	float fHeight;
 	bool fInExpando;
-	const BBitmap* fIcon;	
+	const BBitmap* fIcon;
 };
 
 #endif /* BARMENUTITLE_H */
diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 53dfeec..cac3472 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -135,9 +136,9 @@ TBarView::Draw(BRect)
 	rgb_color light = tint_color(ViewColor(), B_LIGHTEN_2_TINT);
 
 	SetHighColor(hilite);
-	if (AcrossTop()) 
+	if (AcrossTop())
 		StrokeLine(bounds.LeftBottom(), bounds.RightBottom());
-	else if (AcrossBottom()) 
+	else if (AcrossBottom())
 		StrokeLine(bounds.LeftTop(), bounds.RightTop());
 
 	if (Vertical() && Expando()) {
@@ -166,7 +167,7 @@ TBarView::MessageReceived(BMessage* message)
 			// so that I can follow the common pathway
 			// for adding icons to the tray
 			int32 id;
-			AddItem(new BMessage(*message), B_DESKBAR_TRAY, &id); 
+			AddItem(new BMessage(*message), B_DESKBAR_TRAY, &id);
 			break;
 		}
 
@@ -206,9 +207,9 @@ TBarView::PlaceBeMenu()
 		fBarMenuBar = NULL;
 	}
 
-	//	top or bottom expando mode has Be menu built in for tracking
-	//	only for vertical mini or expanded
-	//	mini mode will have team menu added as part of BarMenuBar
+	// top or bottom expando mode has Be menu built in for tracking
+	// only for vertical mini or expanded
+	// mini mode will have team menu added as part of BarMenuBar
 	if (fVertical && !fBarMenuBar) {
 		//	create the Be menu
 		BRect mbarFrame(Bounds());
@@ -217,11 +218,11 @@ TBarView::PlaceBeMenu()
 		AddChild(fBarMenuBar);
 	}
 
-	//	if there isn't a bemenu at this point,
-	//	DB should be in top/bottom mode, else error
+	// if there isn't a bemenu at this point,
+	// DB should be in top/bottom mode, else error
 	if (!fBarMenuBar)
 		return;
-		
+
 	float width = sMinimumWindowWidth;
 	BPoint loc(B_ORIGIN);
 	BRect menuFrame(fBarMenuBar->Frame());
@@ -237,9 +238,10 @@ TBarView::PlaceBeMenu()
 		else
 			width = floorf(width) / 2;
 		loc = Bounds().LeftTop();
-	} else 
+	} else {
 		// mini mode, BeMenu next to team menu
 		fBarMenuBar->AddTeamMenu();
+	}
 
 	fBarMenuBar->SmartResize(width, menuFrame.Height());
 	fBarMenuBar->MoveTo(loc);
@@ -257,13 +259,13 @@ TBarView::PlaceTray(bool, bool, BRect screenFrame)
 		fDragRegion->MoveTo(statusLoc);
 
 		if (!fReplicantTray->IsHidden())
-			fReplicantTray->Hide();	
+			fReplicantTray->Hide();
 
 		return;
 	}
 
 	if (fReplicantTray->IsHidden())
-		fReplicantTray->Show();	
+		fReplicantTray->Show();
 
 	if (fTrayLocation != 0) {
 		fReplicantTray->SetMultiRow(fVertical);
@@ -347,7 +349,7 @@ TBarView::GetPreferredWindowSize(BRect screenFrame, float* width, float* height)
 		}
 	} else {
 		// four corners
-		if (fTrayLocation != 0)		
+		if (fTrayLocation != 0)
 			windowHeight = fDragRegion->Frame().bottom;
 		else
 			windowHeight = fBarMenuBar->Frame().bottom;
@@ -404,10 +406,10 @@ TBarView::SaveSettings()
 	settings->state = (uint32)State();
 	settings->width = 0;
 	settings->showTime = ShowingClock();
-	
+
 	fReplicantTray->RememberClockSettings();
-	settings->alwaysOnTop = (Window()->Feel() & B_FLOATING_ALL_WINDOW_FEEL)
-		!= 0;
+	settings->alwaysOnTop
+		= (Window()->Feel() & B_FLOATING_ALL_WINDOW_FEEL) != 0;
 }
 
 
@@ -424,7 +426,7 @@ TBarView::UpdateAutoRaise()
 void
 TBarView::UpdatePlacement()
 {
-	ChangeState(fState, fVertical, fLeft, fTop);	
+	ChangeState(fState, fVertical, fLeft, fTop);
 }
 
 
@@ -455,7 +457,7 @@ TBarView::ChangeState(int32 state, bool vertical, bool left, bool top)
 	BString* signature = NULL;
 	if (fVertical && Expando()
 		&& static_cast<TBarApp*>(be_app)->Settings()->superExpando) {
-		// Get a list of the signatures of expanded apps. Can't use 
+		// Get a list of the signatures of expanded apps. Can't use
 		// team_id because there can be more than one team per application
 		if (fVertical && Expando() && vertical && fExpando) {
 			for (int index = 0; index < fExpando->CountItems(); index++) {
@@ -469,10 +471,10 @@ TBarView::ChangeState(int32 state, bool vertical, bool left, bool top)
 		}
 	}
 
- 	PlaceApplicationBar(screenFrame);
- 	SizeWindow(screenFrame);
- 	PositionWindow(screenFrame);
- 	Window()->UpdateIfNeeded();
+	PlaceApplicationBar(screenFrame);
+	SizeWindow(screenFrame);
+	PositionWindow(screenFrame);
+	Window()->UpdateIfNeeded();
 
 	// Re-expand those apps.
 	if (expandedItems.CountItems() > 0) {
@@ -505,7 +507,7 @@ TBarView::ChangeState(int32 state, bool vertical, bool left, bool top)
 }
 
 
-//	window placement functions
+// window placement functions
 
 bool
 TBarView::Vertical() const
@@ -558,7 +560,7 @@ TBarView::State() const
 
 // optional functionality functions
 
-bool 
+bool
 TBarView::MilTime() const
 {
 	return fShowInterval;
@@ -586,7 +588,7 @@ void
 TBarView::CacheDragData(const BMessage* incoming)
 {
 	if (!incoming)
-		return;	
+		return;
 
 	if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage))
 		return;
@@ -614,7 +616,7 @@ init_tracking_hook(BMenuItem* item,
 
 status_t
 TBarView::DragStart()
-{	
+{
 	if (!Dragging())
 		return B_OK;
 
@@ -624,7 +626,7 @@ TBarView::DragStart()
 
 	if (fExpando && fExpando->Frame().Contains(loc)) {
 		ConvertToScreen(&loc);
-		BPoint expandoLocation = fExpando->ConvertFromScreen(loc);		
+		BPoint expandoLocation = fExpando->ConvertFromScreen(loc);
 		TTeamMenuItem* item = fExpando->TeamItemAtPoint(expandoLocation);
 
 		if (fLastDragItem)
@@ -634,8 +636,8 @@ TBarView::DragStart()
 			if (item == fLastDragItem)
 				return B_OK;
 
-			fLastDragItem = item;		
-		}					
+			fLastDragItem = item;
+		}
 	}
 
 	return B_OK;
@@ -676,7 +678,7 @@ TBarView::MenuTrackingHook(BMenu* menu, void* castToThis)
 
 			if (bemenu && bemenu->LockLooper()) {
 				bemenu->ConvertFromScreen(&location);
-				if (bemenu->Frame().Contains(location)) 
+				if (bemenu->Frame().Contains(location))
 					endMenu = false;
 
 				bemenu->UnlockLooper();
@@ -685,7 +687,7 @@ TBarView::MenuTrackingHook(BMenu* menu, void* castToThis)
 			if (endMenu && expando) {
 				expando->ConvertFromScreen(&location);
 				BMenuItem* item = expando->TeamItemAtPoint(location);
-				if (item) 
+				if (item)
 					endMenu = false;
 			}
 			barview->UnlockLooper();
@@ -757,7 +759,7 @@ TBarView::AppCanHandleTypes(const char* signature)
 	if (appmime.GetAppHint(&hintref) != B_OK)
 		return false;
 
-	// an app was found, now see if it supports any of 
+	// an app was found, now see if it supports any of
 	// the refs in the message
 	BFile file(&hintref, O_RDONLY);
 	BAppFileInfo fileinfo(&file);
@@ -768,7 +770,7 @@ TBarView::AppCanHandleTypes(const char* signature)
 
 	int32 count = fCachedTypesList->CountItems();
 	for (int32 i = 0 ; i < count ; i++) {
-		if (fileinfo.IsSupportedType(fCachedTypesList->ItemAt(i)->String())) 
+		if (fileinfo.IsSupportedType(fCachedTypesList->ItemAt(i)->String()))
 			return true;
 	}
 
@@ -910,9 +912,9 @@ TBarView::ItemExists(const char* name, DeskbarShelf)
 
 int32
 TBarView::CountItems(DeskbarShelf)
-{	
-	return fReplicantTray->IconCount();	
-}	
+{
+	return fReplicantTray->IconCount();
+}
 
 
 status_t
diff --git a/src/apps/deskbar/BarView.h b/src/apps/deskbar/BarView.h
index a481445..8f4e5b8 100644
--- a/src/apps/deskbar/BarView.h
+++ b/src/apps/deskbar/BarView.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -98,7 +99,7 @@ class TBarView : public BView {
 		void CacheDragData(const BMessage* incoming);
 		status_t DragStart();
 		static bool MenuTrackingHook(BMenu* menu, void* castToThis);
-		void DragStop(bool full=false);
+		void DragStop(bool full = false);
 		TrackingHookData* GetTrackingHookData();
 		bool Dragging() const;
 		const BMessage* DragMessage() const;
diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index 26b02b7..7702e84 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -58,8 +59,8 @@ All rights reserved.
 #include <MessagePrivate.h>
 
 
-// This is a very ugly hack to be able to call the private BMenuBar::StartMenuBar()
-// method from the TBarWindow::ShowBeMenu() method.
+// This is a very ugly hack to be able to call the private
+// BMenuBar::StartMenuBar() method from the TBarWindow::ShowBeMenu() method.
 // Don't do this at home -- but why the hell is this method private?
 #if __MWERKS__
 	#define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarFlbbP5BRect
@@ -70,7 +71,8 @@ All rights reserved.
 #else
 #	error "You may want to port this ugly hack to your compiler ABI"
 #endif
-extern "C" void BMenuBar_StartMenuBar_Hack(BMenuBar*,int32,bool,bool,BRect*);
+extern "C" void
+	BMenuBar_StartMenuBar_Hack(BMenuBar*, int32, bool, bool, BRect*);
 
 
 TBeMenu* TBarWindow::sBeMenu = NULL;
@@ -312,7 +314,7 @@ TBarWindow::ShowBeMenu()
 	if (menuBar == NULL)
 		return;
 
-	BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
+	BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL);
 }
 
 
@@ -326,11 +328,11 @@ TBarWindow::ShowTeamMenu()
 	if (KeyMenuBar() == NULL)
 		return;
 
-	BMenuBar_StartMenuBar_Hack(KeyMenuBar(),index,true,true,NULL);
+	BMenuBar_StartMenuBar_Hack(KeyMenuBar(), index, true, true, NULL);
 }
 
 
-/**	determines the actual location of the window */
+// determines the actual location of the window
 
 deskbar_location
 TBarWindow::DeskbarLocation() const
@@ -552,7 +554,6 @@ TBarWindow::AddItem(BMessage* message)
 		if (err < B_OK)
 			delete archive;
 	} else if (message->FindRef("addon", &ref) == B_OK) {
-		//
 		//	exposing the name of the view here is not so great
 		TReplicantTray* tray
 			= dynamic_cast<TReplicantTray*>(FindView("Status"));
@@ -579,8 +580,8 @@ TBarWindow::RemoveItem(BMessage* message)
 	int32 id;
 	const char* name;
 
-	// 	ids ought to be unique across all shelves, assuming, of course,
-	//	that sometime in the future there may be more than one
+	// ids ought to be unique across all shelves, assuming, of course,
+	// that sometime in the future there may be more than one
 #if SHELF_AWARE
 	if (message->FindInt32("shelf", (int32*)&shelf) == B_OK) {
 		if (message->FindString("name", &name) == B_OK)
@@ -589,8 +590,8 @@ TBarWindow::RemoveItem(BMessage* message)
 #endif
 		if (message->FindInt32("id", &id) == B_OK) {
 			fBarView->RemoveItem(id);
-		//	remove the following two lines if and when the
-		//	shelf option returns
+		// remove the following two lines if and when the
+		// shelf option returns
 		} else if (message->FindString("name", &name) == B_OK)
 			fBarView->RemoveItem(name, B_DESKBAR_TRAY);
 
@@ -632,3 +633,4 @@ TBarWindow::_IsFocusMessage(BMessage* message)
 
 	return true;
 }
+
diff --git a/src/apps/deskbar/BarWindow.h b/src/apps/deskbar/BarWindow.h
index ac27410..73568f1 100644
--- a/src/apps/deskbar/BarWindow.h
+++ b/src/apps/deskbar/BarWindow.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 BAR_WINDOW_H
diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp
index 7f22518..005fb07 100644
--- a/src/apps/deskbar/BeMenu.cpp
+++ b/src/apps/deskbar/BeMenu.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -476,9 +477,7 @@ TRecentsMenu::~TRecentsMenu()
 void
 TRecentsMenu::DetachedFromWindow()
 {
-	//
-	//	BNavMenu::DetachedFromWindow sets the TypesList to NULL
-	//
+	// BNavMenu::DetachedFromWindow sets the TypesList to NULL
 	BMenu::DetachedFromWindow();
 }
 
diff --git a/src/apps/deskbar/BeMenu.h b/src/apps/deskbar/BeMenu.h
index 276275d..9612a04 100644
--- a/src/apps/deskbar/BeMenu.h
+++ b/src/apps/deskbar/BeMenu.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -42,7 +43,7 @@ All rights reserved.
 class TBarView;
 
 enum recent_type {
-	kRecentDocuments	= 0,
+	kRecentDocuments = 0,
 	kRecentApplications,
 	kRecentFolders,
 	kRecentAppDocuments
@@ -76,7 +77,7 @@ class TRecentsMenu : public BNavMenu {
 
 		int32 			fItemIndex;
 		BMessage		fRecentList;
-		
+
 		TBarView		*fBarView;
 };
 
@@ -102,7 +103,7 @@ class TBeMenu : public BNavMenu {
 		void			AttachedToWindow();
 		void			DetachedFromWindow();
 
-		void			ResetTargets();		
+		void			ResetTargets();
 
 		static BMessenger DefaultTarget();
 
@@ -118,15 +119,15 @@ class TBeMenu : public BNavMenu {
 
 		bool			AddStandardBeMenuItems();
 
-	private:		
-		virtual	bool	StartBuildingItemList();
+	private:
+		virtual bool	StartBuildingItemList();
 		virtual void	DoneBuildingItemList();
-		virtual	bool	AddNextItem();
-		virtual	void	ClearMenuBuildingState();
+		virtual bool	AddNextItem();
+		virtual void	ClearMenuBuildingState();
 
-		//	to keep track of the menu building state
-		State 			fAddState;	
-		TBarView		*fBarView;
+		// to keep track of the menu building state
+		State 			fAddState;
+		TBarView*		fBarView;
 };
 
 #endif	/* _BE_MENU_H_ */
diff --git a/src/apps/deskbar/CalendarMenuWindow.cpp b/src/apps/deskbar/CalendarMenuWindow.cpp
index 7cdbb61..c7af6d1 100644
--- a/src/apps/deskbar/CalendarMenuWindow.cpp
+++ b/src/apps/deskbar/CalendarMenuWindow.cpp
@@ -24,7 +24,7 @@ using BPrivate::B_WEEK_START_SUNDAY;
 using BPrivate::B_WEEK_START_MONDAY;
 
 
-// #pragma mark -- FlatButton
+//	#pragma mark -- FlatButton
 
 
 class FlatButton : public BButton {
@@ -66,7 +66,7 @@ FlatButton::Draw(BRect updateRect)
 }
 
 
-// #pragma mark -- CalendarMenuWindow
+//	#pragma mark -- CalendarMenuWindow
 
 
 enum {
diff --git a/src/apps/deskbar/CalendarMenuWindow.h b/src/apps/deskbar/CalendarMenuWindow.h
index 57b627e..1ac0a78 100644
--- a/src/apps/deskbar/CalendarMenuWindow.h
+++ b/src/apps/deskbar/CalendarMenuWindow.h
@@ -17,7 +17,8 @@ class BStringView;
 namespace BPrivate {
 	class BCalendarView;
 }
-using BPrivate::BCalendarView;
+
+	using BPrivate::BCalendarView;
 
 
 class CalendarMenuWindow : public BWindow {
@@ -25,9 +26,9 @@ public:
 					CalendarMenuWindow(BPoint where);
 	virtual			~CalendarMenuWindow();
 
-	virtual	void	Show();
-	virtual	void	WindowActivated(bool active);
-	virtual	void	MessageReceived(BMessage* message);
+	virtual void	Show();
+	virtual void	WindowActivated(bool active);
+	virtual void	MessageReceived(BMessage* message);
 
 private:
 	void			_UpdateUI(const BDate& date);
diff --git a/src/apps/deskbar/DeskBarUtils.cpp b/src/apps/deskbar/DeskBarUtils.cpp
index 151fd60..791a809 100644
--- a/src/apps/deskbar/DeskBarUtils.cpp
+++ b/src/apps/deskbar/DeskBarUtils.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -60,11 +61,11 @@ AddRefsToBeMenu(const BMessage* m, entry_ref* subdirectory)
 		int32 count = 0;
 		uint32 type = 0;
 		entry_ref ref;
-		
+
 		m->GetInfo("refs", &type, &count);
 		if (count <= 0)
 			return;
-			
+
 		BPath path;
 		BSymLink link;
 		BDirectory dir;
@@ -72,8 +73,7 @@ AddRefsToBeMenu(const BMessage* m, entry_ref* subdirectory)
 			ref = *subdirectory;
 			BEntry entry(&ref);
 			if (entry.Exists()) {
-				//	if the ref is a file
-				//	get the parent and convert it to a ref
+				// if the ref is a file get the parent and convert it to a ref
 				if (entry.IsFile()) {
 					BEntry parent;
 					entry.GetParent(&parent);
@@ -81,7 +81,7 @@ AddRefsToBeMenu(const BMessage* m, entry_ref* subdirectory)
 				}
 			} else
 				return;
-				
+
 			dir.SetTo(&ref);
 		} else {
 			if (find_directory(B_USER_DESKBAR_DIRECTORY, &path) == B_OK)
@@ -89,13 +89,12 @@ AddRefsToBeMenu(const BMessage* m, entry_ref* subdirectory)
 			else
 				return;
 		}
-			
+
 		for (long i = 0; i < count; i++) {
 			if (m->FindRef("refs", i, &ref) == B_NO_ERROR) {
-
 				BEntry entry(&ref);
 				entry.GetPath(&path);
-				
+
 				dir.CreateSymLink(ref.name, path.Path(), &link);
 			}
 		}
diff --git a/src/apps/deskbar/DeskBarUtils.h b/src/apps/deskbar/DeskBarUtils.h
index 1f05c83..b35ad56 100644
--- a/src/apps/deskbar/DeskBarUtils.h
+++ b/src/apps/deskbar/DeskBarUtils.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp
index 0fd4483..1622b67 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -118,8 +119,8 @@ TExpandoMenuBar::AttachedToWindow()
 			R_BeLogoIcon);
 		if (logoBitmap != NULL)
 			fBeMenuWidth = logoBitmap->Bounds().Width() + 16;
- 		fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
- 			logoBitmap, beMenu, true);
+		fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
+			logoBitmap, beMenu, true);
 		AddItem(fBeMenuItem);
 
 		fSeparatorItem = new TTeamMenuItem(kSepItemWidth, height, fVertical);
@@ -584,10 +585,10 @@ TExpandoMenuBar::RemoveTeam(team_id team, bool partial)
 				RemoveItem(i);
 
 				if (fVertical) {
-					//	instead of resizing the window here and there in the
-					//	code the resize method will be centered in one place
-					//	thus, the same behavior (good or bad) will be used
-					//	whereever window sizing is done
+					// instead of resizing the window here and there in the
+					// code the resize method will be centered in one place
+					// thus, the same behavior (good or bad) will be used
+					// whereever window sizing is done
 					fBarView->SizeWindow(BScreen(Window()).Frame());
 				} else
 					CheckItemSizes(-1);
@@ -613,8 +614,8 @@ TExpandoMenuBar::CheckItemSizes(int32 delta)
 
 	if (!fBarView->Vertical()) {
 		// in this case there are 2 extra items:
-		//		The Be Menu
-		//		The little separator item
+		//   - The Be Menu
+		//   - The little separator item
 		fullWidth = fullWidth - (sMinimumWindowWidth * 2)
 			+ (fBeMenuWidth + kSepItemWidth);
 		width -= (fBeMenuWidth + kSepItemWidth);
@@ -624,11 +625,11 @@ TExpandoMenuBar::CheckItemSizes(int32 delta)
 	if (delta >= 0 && fullWidth > width) {
 		fOverflow = true;
 		reset = true;
-		newWidth = floorf(width/count);
+		newWidth = floorf(width / count);
 	} else if (delta < 0 && fOverflow) {
 		reset = true;
 		if (fullWidth > width)
-			newWidth = floorf(width/count);
+			newWidth = floorf(width / count);
 		else
 			newWidth = sMinimumWindowWidth;
 	}
@@ -713,10 +714,9 @@ void
 TExpandoMenuBar::CheckForSizeOverrun()
 {
 	BRect screenFrame = (BScreen(Window())).Frame();
-	if (fVertical)
-		fIsScrolling = Window()->Frame().bottom > screenFrame.bottom;
-	else
-		fIsScrolling = false;
+
+	fIsScrolling = fVertical ? Window()->Frame().bottom > screenFrame.bottom
+		: false;
 }
 
 
@@ -744,7 +744,7 @@ TExpandoMenuBar::monitor_team_windows(void* arg)
 			// Set all WindowMenuItems to require an update.
 			TWindowMenuItem* item = NULL;
 			for (int32 i = 0; i < totalItems; i++) {
-				if (!teamMenu->SubmenuAt(i)){
+				if (!teamMenu->SubmenuAt(i)) {
 					item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
 					item->SetRequireUpdate();
 				}
@@ -814,7 +814,7 @@ TExpandoMenuBar::monitor_team_windows(void* arg)
 
 			// Remove any remaining items which require an update.
 			for (int32 i = 0; i < totalItems; i++) {
-				if (!teamMenu->SubmenuAt(i)){
+				if (!teamMenu->SubmenuAt(i)) {
 					item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
 					if (item && item->RequiresUpdate()) {
 						item = static_cast<TWindowMenuItem*>
diff --git a/src/apps/deskbar/ExpandoMenuBar.h b/src/apps/deskbar/ExpandoMenuBar.h
index 928555c..6a96559 100644
--- a/src/apps/deskbar/ExpandoMenuBar.h
+++ b/src/apps/deskbar/ExpandoMenuBar.h
@@ -26,17 +26,18 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 EXPANDO_MENU_BAR_H
 #define EXPANDO_MENU_BAR_H
 
-//	application list
-//	top level at window
-//	in expanded mode horizontal and vertical
+// application list
+// top level at window
+// in expanded mode horizontal and vertical
 
 
 #include <MenuBar.h>
diff --git a/src/apps/deskbar/LICENSE b/src/apps/deskbar/LICENSE
index 6992c78..dc84944 100644
--- a/src/apps/deskbar/LICENSE
+++ b/src/apps/deskbar/LICENSE
@@ -25,7 +25,8 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp
index aecbba7..bb378f1 100644
--- a/src/apps/deskbar/PreferencesWindow.cpp
+++ b/src/apps/deskbar/PreferencesWindow.cpp
@@ -35,8 +35,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 	// Controls
 	fMenuRecentDocuments = new BCheckBox(B_TRANSLATE("Recent documents:"),
 		new BMessage(kUpdateRecentCounts));
-	fMenuRecentApplications = new BCheckBox(
-		B_TRANSLATE("Recent applications:"),
+	fMenuRecentApplications = new BCheckBox(B_TRANSLATE("Recent applications:"),
 		new BMessage(kUpdateRecentCounts));
 	fMenuRecentFolders = new BCheckBox(B_TRANSLATE("Recent folders:"),
 		new BMessage(kUpdateRecentCounts));
@@ -52,8 +51,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 		new BMessage(kSortRunningApps));
 	fAppsSortTrackerFirst = new BCheckBox(B_TRANSLATE("Tracker always first"),
 		new BMessage(kTrackerFirst));
-	fAppsShowExpanders = new BCheckBox(
-		B_TRANSLATE("Show application expander"),
+	fAppsShowExpanders = new BCheckBox(B_TRANSLATE("Show application expander"),
 		new BMessage(kSuperExpando));
 	fAppsExpandNew = new BCheckBox(B_TRANSLATE("Expand new applications"),
 		new BMessage(kExpandNewTeams));
@@ -83,7 +81,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 
 	// Values
 	TBarApp* barApp = static_cast<TBarApp*>(be_app);
-	desk_settings* appSettings = barApp->Settings();;
+	desk_settings* appSettings = barApp->Settings();
 
 	fAppsSort->SetValue(appSettings->sortRunningApps);
 	fAppsSortTrackerFirst->SetValue(appSettings->trackerAlwaysFirst);
diff --git a/src/apps/deskbar/PreferencesWindow.h b/src/apps/deskbar/PreferencesWindow.h
index 9bacafd..a45005c 100644
--- a/src/apps/deskbar/PreferencesWindow.h
+++ b/src/apps/deskbar/PreferencesWindow.h
@@ -28,8 +28,8 @@ public:
 							PreferencesWindow(BRect frame);
 							~PreferencesWindow();
 
-	virtual	void			MessageReceived(BMessage* message);
-	virtual	void			WindowActivated(bool active);
+	virtual void			MessageReceived(BMessage* message);
+	virtual void			WindowActivated(bool active);
 
 private:
 			void			_UpdateRecentCounts();
diff --git a/src/apps/deskbar/ResourceSet.cpp b/src/apps/deskbar/ResourceSet.cpp
index 6bbb33b..fc9369c 100644
--- a/src/apps/deskbar/ResourceSet.cpp
+++ b/src/apps/deskbar/ResourceSet.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -70,78 +71,78 @@ namespace TResourcePrivate {
 			:	fDeleteOK(false)
 		{
 		}
-		
+
 		virtual ~TypeObject()
 		{
 			if (!fDeleteOK)
 				debugger("deleting object owned by BResourceSet");
 		}
-		
+
 		void Delete()
 		{
 			fDeleteOK = true;
 		}
-		
+
 	private:
 		TypeObject(const TypeObject &);
 		TypeObject &operator=(const TypeObject &);
 		bool operator==(const TypeObject &);
 		bool operator!=(const TypeObject &);
-		
+
 		bool fDeleteOK;
 	};
-	
+
 	class BitmapTypeItem : public BBitmap, public TypeObject {
 	public:
 		BitmapTypeItem(BRect bounds, uint32 flags, color_space depth,
-			int32 bytesPerRow=B_ANY_BYTES_PER_ROW, screen_id screenID
+			int32 bytesPerRow = B_ANY_BYTES_PER_ROW, screen_id screenID
 			= B_MAIN_SCREEN_ID)
 			:	BBitmap(bounds, flags, depth, bytesPerRow, screenID)
 		{
 		}
-		
+
 		BitmapTypeItem(const BBitmap* source, bool accepts_views = false,
 			bool need_contiguous = false)
 			:	BBitmap(source, accepts_views, need_contiguous)
 		{
 		}
-		
+
 		BitmapTypeItem(BMessage* data)
 			:	BBitmap(data)
 		{
 		}
-		
+
 		virtual ~BitmapTypeItem()
 		{
 		}
 	};
-	
+
 	class StringBlockTypeItem : public TStringBlock, public TypeObject {
 	public:
 		StringBlockTypeItem(BDataIO* data)
 			:	TStringBlock(data)
 		{
 		}
-		
+
 		StringBlockTypeItem(const void* block, size_t size)
 			:	TStringBlock(block, size)
 		{
 		}
-		
+
 		virtual ~StringBlockTypeItem()
 		{
 		}
 	};
-	
+
 	class TypeItem {
 	public:
 		TypeItem(int32 id, const char* name, const void* data, size_t size)
-			: fID(id), fName(name),
-			  fData(const_cast<void*>(data)), fSize(size), fObject(0),
-			  fOwnData(false), fSourceIsFile(false)
+			:	fID(id), fName(name),
+				fData(const_cast<void*>(data)), fSize(size), fObject(0),
+				fOwnData(false), fSourceIsFile(false)
 		{
 		}
-		
+
 		TypeItem(int32 id, const char* name, BFile* file)
 			:	fID(id),
 				fName(name),
@@ -162,7 +163,7 @@ namespace TResourcePrivate {
 				}
 			}
 		}
-		
+
 		virtual ~TypeItem()
 		{
 			if (fOwnData) {
@@ -172,19 +173,27 @@ namespace TResourcePrivate {
 			}
 			SetObject(NULL);
 		}
-		
+
 		int32 ID() const
-			{ return fID; }
+		{
+			return fID;
+		}
 
 		const char* Name() const
-			{ return fName.String(); }
+		{
+			return fName.String();
+		}
 
 		const void* Data() const
-			{ return fData; }
+		{
+			return fData;
+		}
 
 		size_t Size() const
-			{ return fSize; }
-		
+		{
+			return fSize;
+		}
+
 		void SetObject(TypeObject* object)
 		{
 			if (object == fObject)
@@ -195,14 +204,20 @@ namespace TResourcePrivate {
 		}
 
 		TypeObject* Object() const
-			{ return fObject; }
-		
+		{
+			return fObject;
+		}
+
 		void SetSourceIsFile(bool state)
-			{ fSourceIsFile = state; }
+		{
+			fSourceIsFile = state;
+		}
 
 		bool SourceIsFile() const
-			{ return fSourceIsFile; }
-		
+		{
+			return fSourceIsFile;
+		}
+
 	private:
 		int32 fID;
 		BString fName;
@@ -212,7 +227,7 @@ namespace TResourcePrivate {
 		bool fOwnData;
 		bool fSourceIsFile;
 	};
-	
+
 	static bool FreeTypeItemFunc(void* item)
 	{
 		delete reinterpret_cast<TypeItem*>(item);
@@ -225,16 +240,18 @@ namespace TResourcePrivate {
 			:	fType(type)
 		{
 		}
-		
+
 		virtual ~TypeList()
 		{
 			fItems.DoForEach(FreeTypeItemFunc);
 			fItems.MakeEmpty();
 		}
-		
+
 		type_code Type() const
-			{ return fType; }
-		
+		{
+			return fType;
+		}
+
 		TypeItem* FindItemByID(int32 id)
 		{
 			for (int32 i = 0; i < fItems.CountItems(); i++ ) {
@@ -254,20 +271,19 @@ namespace TResourcePrivate {
 			}
 			return NULL;
 		}
-		
+
 		void AddItem(TypeItem* item)
 		{
 			fItems.AddItem(item);
 		}
-		
+
 	private:
 		type_code fType;
 		BList fItems;
 	};
-
 }
 
-using namespace TResourcePrivate;
+	using namespace TResourcePrivate;
 
 //	#pragma mark -
 // ----------------------------- TStringBlock -----------------------------
@@ -282,13 +298,13 @@ TStringBlock::TStringBlock(BDataIO* data)
 	fStrings = (char*)malloc(1024);
 	size_t pos = 0;
 	ssize_t amount;
-	while ((amount=data->Read(fStrings + pos, 1024)) == 1024) {
+	while ((amount = data->Read(fStrings + pos, 1024)) == 1024) {
 		pos += amount;
 		fStrings = (char*)realloc(fStrings, pos + 1024);
 	}
 	if (amount > 0)
 		pos += amount;
-	
+
 	fNumEntries = PreIndex(fStrings, amount);
 	fIndex = (size_t*)malloc(sizeof(size_t) * fNumEntries);
 	MakeIndex(fStrings, amount, fNumEntries, fIndex);
@@ -304,7 +320,7 @@ TStringBlock::TStringBlock(const void* block, size_t size)
 {
 	fIndex = (size_t*)const_cast<void*>(block);
 	fStrings = (char*)const_cast<void*>(block);
-	
+
 	// Figure out how many entries there are.
 	size_t last_off = 0;
 	while (fIndex[fNumEntries] > last_off && fIndex[fNumEntries] < size ) {
@@ -339,12 +355,12 @@ size_t
 TStringBlock::PreIndex(char* strings, ssize_t len)
 {
 	size_t count = 0;
-	
 	char* orig = strings;
 	char* end = strings + len;
 	bool in_cr = false;
 	bool first = true;
 	bool skipping = false;
+
 	while (orig < end) {
 		if (*orig == '\n' || *orig == '\r' || *orig == 0) {
 			if (!in_cr && *orig == '\r')
@@ -371,30 +387,29 @@ TStringBlock::PreIndex(char* strings, ssize_t len)
 				case '\\':
 					*strings = '\\';
 					break;
-					
+
 				case '\n':
 					*strings = '\n';
 					break;
-					
+
 				case '\r':
 					*strings = '\r';
 					break;
-					
+
 				case '\t':
 					*strings = '\t';
 					break;
-					
+
 				default:
 					*strings = *orig;
 					break;
 			}
-		} else 
+		} else
 			*strings = *orig;
 
 		orig++;
 		strings++;
 	}
-	
 	return count;
 }
 
@@ -405,7 +420,7 @@ TStringBlock::MakeIndex(const char* strings, ssize_t len,
 {
 	*resultingIndex++ = 0;
 	indexLength--;
-	
+
 	ssize_t pos = 0;
 	while (pos < len && indexLength > 0) {
 		if (strings[pos] == 0 ) {
@@ -475,7 +490,7 @@ TResourceSet::AddResources(BResources* RESOURCES_ONLY(resources))
 #if USE_RESOURCES
 	if (!resources)
 		return B_BAD_VALUE;
-	
+
 	BAutolock lock(&fLock);
 	status_t err = fResources.AddItem(resources) ? B_OK : B_ERROR;
 	if (err != B_OK)
@@ -499,7 +514,7 @@ TResourceSet::AddDirectory(const char* fullPath)
 		delete path;
 		return err;
 	}
-	
+
 	BAutolock lock(&fLock);
 	err = fDirectories.AddItem(path) ? B_OK : B_ERROR;
 	if (err != B_OK)
@@ -514,13 +529,13 @@ TResourceSet::AddEnvDirectory(const char* in, const char* defaultValue)
 {
 	BString buf;
 	status_t err = ExpandString(&buf, in);
-	
+
 	if (err != B_OK) {
 		if (defaultValue)
 			return AddDirectory(defaultValue);
 		return err;
 	}
-	
+
 	return AddDirectory(buf.String());
 }
 
@@ -529,11 +544,12 @@ status_t
 TResourceSet::ExpandString(BString* out, const char* in)
 {
 	const char* start = in;
+
 	while (*in) {
 		if (*in == '$') {
 			if (start < in)
-				 out->Append(start, (int32)(in - start));
-			
+				out->Append(start, (int32)(in - start));
+
 			in++;
 			char variableName[1024];
 			size_t i = 0;
@@ -545,25 +561,25 @@ TResourceSet::ExpandString(BString* out, const char* in)
 				if (*in)
 					in++;
 
-			} else 
-				while ((isalnum(*in) || *in == '_') && i
-					< sizeof(variableName) - 1)
+			} else {
+				while ((isalnum(*in) || *in == '_')
+					&& i < sizeof(variableName) - 1)
 					variableName[i++] = *in++;
-			
+			}
+
 			start = in;
-			
 			variableName[i] = '\0';
-			
+
 			const char* val = getenv(variableName);
 			if (!val) {
 				PRINT(("Error: env var %s not found.\n", &variableName[0]));
 				return B_NAME_NOT_FOUND;
 			}
-			
+
 			status_t err = ExpandString(out, val);
 			if (err != B_OK)
 				return err;
-			
+
 		} else if (*in == '\\') {
 			if (start < in)
 				out->Append(start, (int32)(in - start));
@@ -576,7 +592,7 @@ TResourceSet::ExpandString(BString* out, const char* in)
 
 	if (start < in)
 		out->Append(start, (int32)(in - start));
-	
+
 	return B_OK;
 }
 
@@ -585,7 +601,7 @@ const void*
 TResourceSet::FindResource(type_code type, int32 id, size_t* outSize)
 {
 	TypeItem* item = FindItemID(type, id);
-	
+
 	if (outSize)
 		*outSize = item ? item->Size() : 0;
 
@@ -597,7 +613,7 @@ const void*
 TResourceSet::FindResource(type_code type, const char* name, size_t* outSize)
 {
 	TypeItem* item = FindItemName(type, name);
-	
+
 	if (outSize)
 		*outSize = item ? item->Size() : 0;
 
@@ -632,11 +648,12 @@ TResourceSet::FindStringBlock(type_code type, const char* name)
 	return ReturnStringBlockItem(FindItemName(type, name));
 }
 
-	
+
 const char*
 TResourceSet::FindString(type_code type, int32 id, uint32 index)
 {
 	const TStringBlock* stringBlock = FindStringBlock(type, id);
+
 	if (!stringBlock)
 		return NULL;
 
@@ -648,25 +665,26 @@ const char*
 TResourceSet::FindString(type_code type, const char* name, uint32 index)
 {
 	const TStringBlock* stringBlock = FindStringBlock(type, name);
+
 	if (!stringBlock)
 		return NULL;
 
 	return stringBlock->String(index);
 }
 
-	
+
 TypeList*
 TResourceSet::FindTypeList(type_code type)
 {
 	BAutolock lock(&fLock);
-	
+
 	int32 count = fTypes.CountItems();
 	for (int32 i = 0; i < count; i++ ) {
 		TypeList* list = (TypeList*)fTypes.ItemAt(i);
 		if (list && list->Type() == type)
 			return list;
 	}
-	
+
 	return NULL;
 }
 
@@ -676,12 +694,13 @@ TResourceSet::FindItemID(type_code type, int32 id)
 {
 	TypeList* list = FindTypeList(type);
 	TypeItem* item = NULL;
-	
-	if (list) item = list->FindItemByID(id);
-	
+
+	if (list)
+		item = list->FindItemByID(id);
+
 	if (!item)
 		item = LoadResource(type, id, 0, &list);
-	
+
 	return item;
 }
 
@@ -691,13 +710,13 @@ TResourceSet::FindItemName(type_code type, const char* name)
 {
 	TypeList* list = FindTypeList(type);
 	TypeItem* item = NULL;
-	
+
 	if (list)
 		item = list->FindItemByName(name);
-	
+
 	if (!item)
 		item = LoadResource(type, -1, name, &list);
-	
+
 	return item;
 }
 
@@ -707,10 +726,10 @@ TResourceSet::LoadResource(type_code type, int32 id, const char* name,
 	TypeList** inOutList)
 {
 	TypeItem* item = NULL;
-	
+
 	if (name) {
 		BEntry entry;
-		
+
 		// If a named resource, first look in directories.
 		fLock.Lock();
 		int32 count = fDirectories.CountItems();
@@ -731,7 +750,7 @@ TResourceSet::LoadResource(type_code type, int32 id, const char* name,
 		}
 		fLock.Unlock();
 	}
-	
+
 #if USE_RESOURCES
 	if (!item) {
 		// Look through resource objects for data.
@@ -746,7 +765,7 @@ TResourceSet::LoadResource(type_code type, int32 id, const char* name,
 					data = resource->LoadResource(type, id, &size);
 				else if (name != NULL)
 					data = resource->LoadResource(type, name, &size);
-					
+
 				if (data && size) {
 					item = new TypeItem(id, name, data, size);
 					item->SetSourceIsFile(false);
@@ -787,7 +806,7 @@ TResourceSet::ReturnBitmapItem(type_code, TypeItem* from)
 {
 	if (!from)
 		return NULL;
-	
+
 	TypeObject* obj = from->Object();
 	BitmapTypeItem* bitmap = dynamic_cast<BitmapTypeItem*>(obj);
 	if (bitmap)
@@ -803,10 +822,11 @@ TResourceSet::ReturnBitmapItem(type_code, TypeItem* from)
 	// Try to read as an archived bitmap.
 	stream.Seek(0, SEEK_SET);
 	BMessage archive;
-	if (archive.Unflatten(&stream) == B_OK ) {
+	if (archive.Unflatten(&stream) == B_OK) {
 		bitmap = new BitmapTypeItem(&archive);
 		if (bitmap && bitmap->InitCheck() != B_OK) {
-			bitmap->Delete();	// allows us to delete this bitmap...
+			bitmap->Delete();
+				// allows us to delete this bitmap...
 			delete bitmap;
 			bitmap = NULL;
 		}
@@ -815,11 +835,11 @@ TResourceSet::ReturnBitmapItem(type_code, TypeItem* from)
 	if (bitmap) {
 		BAutolock lock(&fLock);
 		if (from->Object() != NULL) {
-			// Whoops!  Someone snuck in under us.
+			// Whoops! Someone snuck in under us.
 			bitmap->Delete();
 			delete bitmap;
 			bitmap = dynamic_cast<BitmapTypeItem*>(from->Object());
-		} else 
+		} else
 			from->SetObject(bitmap);
 	}
 
@@ -832,33 +852,33 @@ TResourceSet::ReturnStringBlockItem(TypeItem* from)
 {
 	if (!from)
 		return NULL;
-	
+
 	TypeObject* obj = from->Object();
 	StringBlockTypeItem* stringBlock = dynamic_cast<StringBlockTypeItem*>(obj);
 	if (stringBlock)
 		return stringBlock;
-	
+
 	// Can't change an existing object.
 	if (obj)
 		return NULL;
-	
+
 	// Don't have a string block in the item -- we'll create one.
 	if (from->SourceIsFile() ) {
 		BMemoryIO stream(from->Data(), from->Size());
 		stringBlock = new StringBlockTypeItem(&stream);
 	} else
 		stringBlock = new StringBlockTypeItem(from->Data(), from->Size());
-	
+
 	if (stringBlock) {
 		BAutolock lock(&fLock);
 		if (from->Object() != NULL) {
-			// Whoops!  Someone snuck in under us.
+			// Whoops! Someone snuck in under us.
 			delete stringBlock;
 			stringBlock = dynamic_cast<StringBlockTypeItem*>(from->Object());
 		} else
 			from->SetObject(stringBlock);
 	}
-	
+
 	return stringBlock;
 }
 
@@ -867,10 +887,8 @@ TResourceSet::ReturnStringBlockItem(TypeItem* from)
 
 
 namespace TResourcePrivate {
-
 	TResourceSet* gResources = NULL;
 	BLocker gResourceLocker;
-	
 }
 
 
@@ -880,7 +898,7 @@ AppResSet()
 	// If already have it, return immediately.
 	if (gResources)
 		return gResources;
-	
+
 	// Don't have 'em, lock access to make 'em.
 	if (!gResourceLocker.Lock())
 		return NULL;
@@ -889,7 +907,7 @@ AppResSet()
 		gResourceLocker.Unlock();
 		return gResources;
 	}
-	
+
 	// Make 'em.
 	gResources = new TResourceSet;
 	gResources->AddResources(BApplication::AppResources());
diff --git a/src/apps/deskbar/ResourceSet.h b/src/apps/deskbar/ResourceSet.h
index 5975304..7012c1d 100644
--- a/src/apps/deskbar/ResourceSet.h
+++ b/src/apps/deskbar/ResourceSet.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 _T_RESOURCE_SET_H
@@ -48,7 +49,7 @@ namespace TResourcePrivate {
 	class TypeList;
 }
 
-using namespace TResourcePrivate;
+	using namespace TResourcePrivate;
 
 const uint32 B_STRING_BLOCK_TYPE = 'SBLK';
 
@@ -57,14 +58,14 @@ public:
 	TStringBlock(BDataIO* data);
 	TStringBlock(const void* block, size_t size);
 	virtual ~TStringBlock();
-	
+
 	const char* String(size_t index) const;
 
 private:
 	size_t PreIndex(char* strings, ssize_t len);
-	void MakeIndex(const char* strings, ssize_t len,
-		size_t indexLen, size_t* outIndex);
-	
+	void MakeIndex(const char* strings, ssize_t len, size_t indexLen,
+		size_t* outIndex);
+
 	size_t fNumEntries;
 	size_t* fIndex;
 	char* fStrings;
@@ -80,34 +81,32 @@ public:
 	status_t AddDirectory(const char* fullPath);
 	status_t AddEnvDirectory(const char* envPath,
 		const char* defaultValue = NULL);
-	
-	const void* FindResource(type_code type, int32 id,
-		size_t* outSize);
-	const void* FindResource(type_code type, const char* name,
-		size_t* outSize);
-	
+
+	const void* FindResource(type_code type, int32 id, size_t* outSize);
+	const void* FindResource(type_code type, const char* name, size_t* outSize);
+
 	const BBitmap* FindBitmap(type_code type, int32 id);
 	const BBitmap* FindBitmap(type_code type, const char* name);
-	
+
 	const TStringBlock* FindStringBlock(type_code type, int32 id);
 	const TStringBlock* FindStringBlock(type_code type, const char* name);
-	
+
 	const char* FindString(type_code type, int32 id, uint32 index);
 	const char* FindString(type_code type, const char* name, uint32 index);
-	
+
 private:
 	status_t ExpandString(BString* out, const char* in);
 	TypeList* FindTypeList(type_code type);
-	
+
 	TypeItem* FindItemID(type_code type, int32 id);
 	TypeItem* FindItemName(type_code type, const char* name);
-	
+
 	TypeItem* LoadResource(type_code type, int32 id, const char* name,
 		TypeList** inoutList = NULL);
-	
+
 	BBitmap* ReturnBitmapItem(type_code type, TypeItem* from);
 	TStringBlock* ReturnStringBlockItem(TypeItem* from);
-	
+
 	BLocker fLock;				// access control.
 	BList fResources;			// containing BResources objects.
 	BList fDirectories;			// containing BPath objects.
diff --git a/src/apps/deskbar/ShowHideMenuItem.cpp b/src/apps/deskbar/ShowHideMenuItem.cpp
index a614fc8..b793426 100644
--- a/src/apps/deskbar/ShowHideMenuItem.cpp
+++ b/src/apps/deskbar/ShowHideMenuItem.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
diff --git a/src/apps/deskbar/ShowHideMenuItem.h b/src/apps/deskbar/ShowHideMenuItem.h
index cd52f09..159dde1 100644
--- a/src/apps/deskbar/ShowHideMenuItem.h
+++ b/src/apps/deskbar/ShowHideMenuItem.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -43,20 +44,20 @@ All rights reserved.
 
 class TShowHideMenuItem : public BMenuItem {
 public:
-						TShowHideMenuItem(const char* title, 
+						TShowHideMenuItem(const char* title,
 										  const BList* teams,
 										  uint32 action);
 
-	static status_t 	TeamShowHideCommon(int32 action, 
-							const BList* teamList, 
-							BRect zoomRect = BRect(0, 0, 0, 0), 
+	static status_t 	TeamShowHideCommon(int32 action,
+							const BList* teamList,
+							BRect zoomRect = BRect(0, 0, 0, 0),
 							bool doZoom = false);
 protected:
 	virtual void		GetContentSize(float* width, float* height);
 	virtual void		DrawContent();
 	virtual status_t	Invoke(BMessage* message = NULL);
 
-private: 
+private:
 	const BList*		fTeams;
 	uint32				fAction;
 	float				fTitleWidth;
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index a504101..14627f2 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -74,19 +75,19 @@ All rights reserved.
 using std::max;
 
 #ifdef DB_ADDONS
-//	Add-on support
+// Add-on support
 //
-//	Item - internal item list (node, eref, etc)
-//	Icon - physical replicant handed to the DeskbarClass class
-//	AddOn - attribute based add-on
+// Item - internal item list (node, eref, etc)
+// Icon - physical replicant handed to the DeskbarClass class
+// AddOn - attribute based add-on
 
 const char* const kInstantiateItemCFunctionName = "instantiate_deskbar_item";
 const char* const kInstantiateEntryCFunctionName = "instantiate_deskbar_entry";
 const char* const kDeskbarSecurityCodeFile = "Deskbar_security_code";
 const char* const kDeskbarSecurityCodeAttr = "be:deskbar_security_code";
 const char* const kStatusPredicate = "be:deskbar_item_status";
-const char* const kEnabledPredicate = "be:deskbar_item_status=enabled";
-const char* const kDisabledPredicate = "be:deskbar_item_status=disabled";
+const char* const kEnabledPredicate = "be:deskbar_item_status = enabled";
+const char* const kDisabledPredicate = "be:deskbar_item_status = disabled";
 
 float sMinimumWindowWidth = kGutter + kMinimumTrayWidth + kDragRegionWidth;
 
@@ -240,8 +241,7 @@ TReplicantTray::DealWithClock(bool showClock)
 }
 
 
-/*!
-	Width is set to a minimum of kMinimumReplicantCount by kMaxReplicantWidth
+/*! Width is set to a minimum of kMinimumReplicantCount by kMaxReplicantWidth
 	if not in multirowmode and greater than kMinimumReplicantCount
 	the width should be calculated based on the actual
 	replicant widths
@@ -255,17 +255,15 @@ TReplicantTray::GetPreferredSize(float* preferredWidth, float* preferredHeight)
 		if (fShelf->CountReplicants() > 0)
 			height = fRightBottomReplicant.bottom;
 
-		// the height will be uniform for the number of rows
-		// necessary to show all the reps + any gutters
-		// necessary for spacing
+		// the height will be uniform for the number of rows necessary to show
+		// all the reps + any gutters necessary for spacing
 		int32 rowCount = (int32)(height / kMaxReplicantHeight);
 		height = kGutter + (rowCount * kMaxReplicantHeight)
 			+ ((rowCount - 1) * kIconGap) + kGutter;
 		height = max(kMinimumTrayHeight, height);
 		width = fMinimumTrayWidth;
 	} else {
-		// if last replicant overruns clock then
-		// resize to accomodate
+		// if last replicant overruns clock then resize to accomodate
 		if (fShelf->CountReplicants() > 0) {
 			if (fBarView->ShowingClock()
 				&& fRightBottomReplicant.right + 6 >= fClock->Frame().left) {
@@ -274,12 +272,13 @@ TReplicantTray::GetPreferredSize(float* preferredWidth, float* preferredHeight)
 			} else
 				width = fRightBottomReplicant.right + 3;
 		}
+
 		// this view has a fixed minimum width
 		width = max(fMinimumTrayWidth, width);
 	}
 
 	*preferredWidth = width;
-	// add 2 for the border
+	// add 1 for the border
 	*preferredHeight = height + 1;
 }
 
@@ -350,8 +349,7 @@ TReplicantTray::ShowReplicantMenu(BPoint point)
 	BPopUpMenu* menu = new BPopUpMenu("", false, false);
 	menu->SetFont(be_plain_font);
 
-	// If the clock is visible, show the extended menu
-	// otheriwse, show "Show Time".
+	// If clock is visible show the extended menu, otherwise show "Show Time"
 
 	if (fBarView->ShowingClock())
 		fClock->ShowClockOptions(ConvertToScreen(point));
@@ -375,7 +373,7 @@ TReplicantTray::MouseDown(BPoint where)
 		DumpList(fItemList);
 #endif
 
-	uint32	buttons;
+	uint32 buttons;
 
 	Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
 	if (buttons == B_SECONDARY_MOUSE_BUTTON) {
@@ -412,15 +410,15 @@ TReplicantTray::InitAddOnSupport()
 {
 	// list to maintain refs to each rep added/deleted
 	fItemList = new BList();
-
 	bool haveKey = false;
- 	BPath path;
+	BPath path;
+
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, true) == B_OK) {
 		path.Append(kDeskbarSecurityCodeFile);
 
-		BFile file(path.Path(),B_READ_ONLY);
+		BFile file(path.Path(), B_READ_ONLY);
 		if (file.InitCheck() == B_OK
-			&& file.Read(&fDeskbarSecurityCode,	sizeof(fDeskbarSecurityCode))
+			&& file.Read(&fDeskbarSecurityCode, sizeof(fDeskbarSecurityCode))
 				== sizeof(fDeskbarSecurityCode))
 			haveKey = true;
 	}
@@ -443,8 +441,7 @@ TReplicantTray::InitAddOnSupport()
 		}
 	}
 
-	// for each volume currently mounted
-	//		index the volume with our indices
+	// for each volume currently mounted index the volume with our indices
 	BVolumeRoster roster;
 	BVolume volume;
 	while (roster.GetNextVolume(&volume) == B_OK) {
@@ -488,8 +485,7 @@ TReplicantTray::RunAddOnQuery(BVolume* volume, const char* predicate)
 		|| fs_stat_index(volume->Device(), kStatusPredicate, &info) != 0)
 		return;
 
-	// run a new query on a specific volume
-	// make it live
+	// run a new query on a specific volume and make it live
 	BQuery query;
 	query.SetVolume(volume);
 	query.SetPredicate(predicate);
@@ -557,7 +553,7 @@ TReplicantTray::NodeExists(node_ref& nodeRef)
 }
 
 
-/*!	This handles B_NODE_MONITOR & B_QUERY_UPDATE messages received
+/*! This handles B_NODE_MONITOR & B_QUERY_UPDATE messages received
 	for the registered add-ons.
 */
 void
@@ -697,8 +693,7 @@ TReplicantTray::HandleEntryUpdate(BMessage* message)
 }
 
 
-/*!
-	The add-ons must support the exported C function API
+/*! The add-ons must support the exported C function API
 	if they do, they will be loaded and added to deskbar
 	primary function is the Instantiate function
 */
@@ -883,7 +878,7 @@ TReplicantTray::MoveItem(entry_ref* ref, ino_t toDirectory)
 	}
 }
 
-#endif	//	add-on support
+#endif // add-on support
 
 //	external add-on API routines
 //	called using the new BDeskbar class
@@ -989,7 +984,7 @@ TReplicantTray::IconCount() const
 }
 
 
-/*!	Message must contain an archivable view for later rehydration.
+/*! Message must contain an archivable view for later rehydration.
 	This function takes over ownership of the provided message on success
 	only.
 	Returns the current replicant ID.
@@ -1004,10 +999,11 @@ TReplicantTray::AddIcon(BMessage* archive, int32* id, const entry_ref* addOn)
 
 	entry_ref ref;
 	if (addOn) {
-		// Use it if we got it
 		ref = *addOn;
+			// Use it if we got it
 	} else {
 		const char* signature;
+
 		status_t status = archive->FindString("add_on", &signature);
 		if (status == B_OK) {
 			BRoster roster;
@@ -1028,10 +1024,9 @@ TReplicantTray::AddIcon(BMessage* archive, int32* id, const entry_ref* addOn)
 		return status;
 
 	BEntry entry(&ref, true);
-		// ToDo: this resolves an eventual link for the item
-		// being added - this is okay for now, but in multi-user
-		// environments, one might want to have links that
-		// carry the be:deskbar_item_status attribute
+		// TODO: this resolves an eventual link for the item being added - this
+		// is okay for now, but in multi-user environments, one might want to
+		// have links that carry the be:deskbar_item_status attribute
 	status = entry.InitCheck();
 	if (status != B_OK)
 		return status;
@@ -1041,10 +1036,10 @@ TReplicantTray::AddIcon(BMessage* archive, int32* id, const entry_ref* addOn)
 		archive->what = 0;
 
 	BRect originalBounds = archive->FindRect("_frame");
-		// this is a work-around for buggy replicants that change their
-		// size in AttachedToWindow() (such as "SVM")
+	// this is a work-around for buggy replicants that change their size in
+	// AttachedToWindow() (such as "SVM")
 
-	// !! check for name collisions?
+	// TODO: check for name collisions?
 	status = fShelf->AddReplicant(archive, BPoint(1, 1));
 	if (status != B_OK)
 		return status;
@@ -1070,7 +1065,7 @@ TReplicantTray::AddIcon(BMessage* archive, int32* id, const entry_ref* addOn)
 	// add the item to the add-on list
 
 	AddItem(*id, nodeRef, entry, addOn != NULL);
- 	return B_OK;
+	return B_OK;
 }
 
 
@@ -1129,8 +1124,7 @@ TReplicantTray::RealReplicantAdjustment(int32 startIndex)
 	float width, height;
 	GetPreferredSize(&width, &height);
 	if (oldWidth != width || oldHeight != height) {
-		// resize view to accomodate the replicants
-		// redraw as necessary
+		// resize view to accomodate the replicants, redraw as necessary
 		AdjustPlacement();
 	}
 }
@@ -1154,7 +1148,7 @@ TReplicantTray::ViewAt(int32* index, int32* id, int32 target, bool byIndex)
 			}
 		}
 	} else {
-		int32 count = fShelf->CountReplicants()-1;
+		int32 count = fShelf->CountReplicants() - 1;
 		int32 localid;
 		for (int32 repIndex = count ; repIndex >= 0 ; repIndex--) {
 			fShelf->ReplicantAt(repIndex, &view, (uint32*)&localid);
@@ -1165,7 +1159,6 @@ TReplicantTray::ViewAt(int32* index, int32* id, int32 target, bool byIndex)
 			}
 		}
 	}
-
 	return NULL;
 }
 
@@ -1189,7 +1182,6 @@ TReplicantTray::ViewAt(int32* index, int32* id, const char* name)
 			return view;
 		}
 	}
-
 	return NULL;
 }
 
@@ -1353,7 +1345,7 @@ TReplicantTray::SetMultiRow(bool state)
 //	#pragma mark -
 
 
-/*!	Draggable region that is asynchronous so that dragging does not block
+/*! Draggable region that is asynchronous so that dragging does not block
 	other activities.
 */
 TDragRegion::TDragRegion(TBarView* parent, BView* child)
@@ -1583,16 +1575,16 @@ bool
 TDragRegion::SwitchModeForRect(BPoint mouse, BRect rect,
 	bool newVertical, bool newLeft, bool newTop, int32 newState)
 {
-	if (!rect.Contains(mouse))
+	if (!rect.Contains(mouse)) {
 		// not our rect
 		return false;
+	}
 
-	if (newVertical == fBarView->Vertical()
-		&& newLeft == fBarView->Left()
-		&& newTop == fBarView->Top()
-		&& newState == fBarView->State())
+	if (newVertical == fBarView->Vertical() && newLeft == fBarView->Left()
+		&& newTop == fBarView->Top() && newState == fBarView->State()) {
 		// already in the correct mode
 		return true;
+	}
 
 	fBarView->ChangeState(newState, newVertical, newLeft, newTop);
 	return true;
diff --git a/src/apps/deskbar/StatusView.h b/src/apps/deskbar/StatusView.h
index aeef04b..31fb82f 100644
--- a/src/apps/deskbar/StatusView.h
+++ b/src/apps/deskbar/StatusView.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -51,12 +52,11 @@ const int32	kIconGap = 2;
 const int32 kGutter = 1;
 const int32 kDragRegionWidth = 6;
 
-//	1 pixel left gutter
-//	space for replicant tray (6 items)
-//	6 pixel drag region
-const float kMinimumTrayWidth = kIconGap
-		+ (kMinimumReplicantCount * kIconGap)
-		+ (kMinimumReplicantCount * kMaxReplicantWidth) + kGutter;
+// 1 pixel left gutter
+// space for replicant tray (6 items)
+// 6 pixel drag region
+const float kMinimumTrayWidth = kIconGap + (kMinimumReplicantCount * kIconGap)
+	+ (kMinimumReplicantCount * kMaxReplicantWidth) + kGutter;
 const float kMinimumTrayHeight = kGutter + kMaxReplicantHeight + kGutter;
 
 extern float sMinimumWindowWidth;
@@ -104,7 +104,7 @@ public:
 	void RemoveIcon(int32 target, bool byIndex = false);
 	void RemoveIcon(const char* name);
 
-	BRect IconFrame(int32 target, bool byIndex=false);
+	BRect IconFrame(int32 target, bool byIndex = false);
 	BRect IconFrame(const char* name);
 
 	bool AcceptAddon(BRect frame, BMessage* message);
diff --git a/src/apps/deskbar/StatusViewShelf.cpp b/src/apps/deskbar/StatusViewShelf.cpp
index c879036..38cd445 100644
--- a/src/apps/deskbar/StatusViewShelf.cpp
+++ b/src/apps/deskbar/StatusViewShelf.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -68,15 +69,16 @@ TReplicantShelf::MessageReceived(BMessage* message)
 			// since we can't use ReplicantDeleted
 			// catch the message and find the id or name specifier
 			// then delete the rep vi the api,
-			//
+
 			// this will fix the problem of realigning the reps
 			// after a remove when done through scripting
-			//
+
 			// note: if specified by index its the index not the id!
 
 			while (message->FindMessage("specifiers", index++, &repspec)
 				== B_OK) {
 				const char* str;
+
 				if (repspec.FindString("property", &str) == B_OK) {
 					if (strcmp(str, "Replicant") == 0) {
 						int32 index;
@@ -103,7 +105,7 @@ TReplicantShelf::MessageReceived(BMessage* message)
 }
 
 
-bool 
+bool
 TReplicantShelf::CanAcceptReplicantView(BRect frame, BView* view,
 	BMessage* message) const
 {
diff --git a/src/apps/deskbar/StatusViewShelf.h b/src/apps/deskbar/StatusViewShelf.h
index 4db46fb..181b4a8 100644
--- a/src/apps/deskbar/StatusViewShelf.h
+++ b/src/apps/deskbar/StatusViewShelf.h
@@ -26,14 +26,15 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
-//	overrides BShelf; rejects draggers that won't fit into the shelf
-//	alligns received draggers into a grid
+// overrides BShelf; rejects draggers that won't fit into the shelf
+// alligns received draggers into a grid
 
 #ifndef __STATUS_VIEW_SHELF__
 #define __STATUS_VIEW_SHELF__
@@ -45,12 +46,12 @@ class TReplicantShelf : public BShelf {
 public:
 						TReplicantShelf(TReplicantTray* view);
 						~TReplicantShelf();
-						
+
 		void			MessageReceived(BMessage*);
-		
+
 protected:
 		bool 			CanAcceptReplicantView(BRect, BView*, BMessage*) const;
-		BPoint 			AdjustReplicantBy(BRect, BMessage*) const;
+		BPoint			AdjustReplicantBy(BRect, BMessage*) const;
 		void 			ReplicantDeleted(int32, const BMessage*, const BView*);
 
 private:
diff --git a/src/apps/deskbar/Switcher.cpp b/src/apps/deskbar/Switcher.cpp
index 86df52d..ed686a2 100644
--- a/src/apps/deskbar/Switcher.cpp
+++ b/src/apps/deskbar/Switcher.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -99,11 +100,11 @@ public:
 								TSwitchManager* manager);
 	virtual					~TSwitcherWindow();
 
-	virtual	bool			QuitRequested();
-	virtual	void			MessageReceived(BMessage* message);
-	virtual	void			Show();
-	virtual	void			Hide();
-	virtual	void			WindowActivated(bool state);
+	virtual bool			QuitRequested();
+	virtual void			MessageReceived(BMessage* message);
+	virtual void			Show();
+	virtual void			Hide();
+	virtual void			WindowActivated(bool state);
 
 			void			DoKey(uint32 key, uint32 modifiers);
 			TIconView*		IconView();
@@ -133,12 +134,14 @@ public:
 			void			UpdateGroup(int32 groupIndex, int32 windowIndex);
 
 	virtual void			AttachedToWindow();
-	virtual	void			Draw(BRect update);
-	virtual	void			Pulse();
-	virtual	void			GetPreferredSize(float* w, float* h);
+	virtual void			Draw(BRect update);
+	virtual void			Pulse();
+	virtual void			GetPreferredSize(float* w, float* h);
 			void			ScrollTo(float x, float y)
-								{ ScrollTo(BPoint(x,y)); }
-	virtual	void			ScrollTo(BPoint where);
+							{
+								ScrollTo(BPoint(x, y));
+							}
+	virtual void			ScrollTo(BPoint where);
 
 			void			ShowIndex(int32 windex);
 			BRect			FrameOf(int32 index) const;
@@ -161,13 +164,15 @@ public:
 			void			Hiding();
 
 	virtual void			KeyDown(const char* bytes, int32 numBytes);
-	virtual	void			Pulse();
-	virtual	void			MouseDown(BPoint point);
-	virtual	void			Draw(BRect updateRect);
+	virtual void			Pulse();
+	virtual void			MouseDown(BPoint point);
+	virtual void			Draw(BRect updateRect);
 
 			void			ScrollTo(float x, float y)
-								{ ScrollTo(BPoint(x,y)); }
-	virtual	void	ScrollTo(BPoint where);
+							{
+								ScrollTo(BPoint(x, y));
+							}
+	virtual void	ScrollTo(BPoint where);
 			void			Update(int32 previous, int32 current,
 								int32 previousSlot, int32 currentSlot,
 								bool forward);
@@ -199,9 +204,9 @@ public:
 
 	virtual void			Draw(BRect update);
 	virtual void			AllAttached();
-	virtual	void			DrawIconScrollers(bool force);
-	virtual	void			DrawWindowScrollers(bool force);
-	virtual	void			MouseDown(BPoint where);
+	virtual void			DrawIconScrollers(bool force);
+	virtual void			DrawWindowScrollers(bool force);
+	virtual void			MouseDown(BPoint where);
 
 private:
 			TSwitchManager*	fManager;
@@ -252,16 +257,12 @@ LowBitIndex(uint32 value)
 inline bool
 IsVisibleInCurrentWorkspace(const window_info* windowInfo)
 {
-	/*
-	 The window list is always ordered from the top
-	 front visible window (the first on the list), going down through all
-	 the other visible windows, then all the hidden or non workspace
-	 visible window at the end.
-
-	 layer > 2 : normal visible window.
-	 layer == 2 : reserved for the desktop window (visible also).
-	 layer < 2 : hidden (0) and non workspace visible window (1)
-	*/
+	// The window list is always ordered from the top front visible window
+	// (the first on the list), going down through all the other visible
+	// windows, then all hidden or non-workspace visible windows at the end.
+	//     layer > 2  : normal visible window
+	//     layer == 2 : reserved for the desktop window (visible also)
+	//     layer < 2  : hidden (0) and non workspace visible window (1)
 	return windowInfo->layer > 2;
 }
 
@@ -280,13 +281,11 @@ bool
 IsWindowOK(const window_info* windowInfo)
 {
 	// is_mini (true means that the window is minimized).
-	// if not, then
-	// show_hide >= 1 means that the window is hidden.
-	//
+	// if not, then show_hide >= 1 means that the window is hidden.
 	// If the window is both minimized and hidden, then you get :
-	//	 TWindow->is_mini = false;
-	//	 TWindow->was_mini = true;
-	//	 TWindow->show_hide >= 1;
+	//     TWindow->is_mini = false;
+	//     TWindow->was_mini = true;
+	//     TWindow->show_hide >= 1;
 
 	if (windowInfo->feel != _STD_W_TYPE_)
 		return false;
@@ -332,14 +331,16 @@ SmartStrcmp(const char* s1, const char* s2)
 			s2++;
 			continue;
 		}
-		if (*s1 != *s2)
-			return 1;		// they differ
+		if (*s1 != *s2) {
+			// they differ
+			return 1;
+		}
 		s1++;
 		s2++;
 	}
 
 	// if one of the strings ended before the other
-	// ??? could process trailing spaces & underscores!
+	// TODO: could process trailing spaces and underscores
 	if (*s1)
 		return 1;
 	if (*s2)
@@ -448,7 +449,7 @@ TSwitchManager::TSwitchManager(BPoint point)
 	TBarApp::Subscribe(BMessenger(this), &tmpList);
 
 	for (int32 i = 0; ; i++) {
-		BarTeamInfo	*barTeamInfo = (BarTeamInfo	*)tmpList.ItemAt(i);
+		BarTeamInfo* barTeamInfo = (BarTeamInfo*)tmpList.ItemAt(i);
 		if (!barTeamInfo)
 			break;
 
@@ -485,6 +486,7 @@ TSwitchManager::MessageReceived(BMessage* message)
 			int i = 0;
 			TTeamGroup* tinfo;
 			message->FindInt32("team", &teamID);
+
 			while ((tinfo = (TTeamGroup*)fGroupList.ItemAt(i)) != NULL) {
 				if (tinfo->TeamList()->HasItem((void*)teamID)) {
 					fGroupList.RemoveItem(i);
@@ -519,15 +521,19 @@ TSwitchManager::MessageReceived(BMessage* message)
 				delete teams;
 				break;
 			}
+
 			delete smallIcon;
+
 			if (message->FindString("sig", &signature) != B_OK) {
 				delete teams;
 				break;
 			}
+
 			if (message->FindInt32("flags", (int32*)&flags) != B_OK) {
 				delete teams;
 				break;
 			}
+
 			if (message->FindString("name", &name) != B_OK) {
 				delete teams;
 				break;
@@ -548,8 +554,7 @@ TSwitchManager::MessageReceived(BMessage* message)
 			const char* signature = message->FindString("sig");
 			team_id team = message->FindInt32("team");
 
-			int32 numItems = fGroupList.CountItems();
-			for (int32 i = 0; i < numItems; i++) {
+			for (int32 i = 0; i < fGroupList.CountItems(); i++) {
 				TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
 				if (strcasecmp(tinfo->Signature(), signature) == 0) {
 					if (!(tinfo->TeamList()->HasItem((void*)team)))
@@ -564,8 +569,7 @@ TSwitchManager::MessageReceived(BMessage* message)
 		{
 			team_id team = message->FindInt32("team");
 
-			int32 numItems = fGroupList.CountItems();
-			for (int32 i = 0; i < numItems; i++) {
+			for (int32 i = 0; i < fGroupList.CountItems(); i++) {
 				TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
 				if (tinfo->TeamList()->HasItem((void*)team)) {
 					tinfo->TeamList()->RemoveItem((void*)team);
@@ -586,7 +590,6 @@ TSwitchManager::MessageReceived(BMessage* message)
 			// starts differentiating initial key_downs from KeyDowns generated
 			// by auto-repeat. Until then the fSkipUntil stuff helps, but it
 			// isn't perfect.
-
 			if (time < fSkipUntil)
 				break;
 
@@ -622,7 +625,7 @@ TSwitchManager::_SortApps()
 	team_id* teams;
 	int32 count;
 	if (BPrivate::get_application_order(current_workspace(), &teams, &count)
-			!= B_OK)
+		!= B_OK)
 		return;
 
 	BList groups;
@@ -658,8 +661,7 @@ TSwitchManager::MainEntry(BMessage* message)
 {
 	bigtime_t now = system_time();
 	bigtime_t timeout = now + 180000;
-		// The delay above was arrived at by trial and error and
-		// has a good "feel"
+		// The above delay has a good "feel" found by trial and error
 
 	app_info appInfo;
 	be_roster->GetActiveAppInfo(&appInfo);
@@ -887,6 +889,7 @@ TSwitchManager::_FindNextValidApp(bool forward)
 			if (fCurrentIndex < 0)
 				fCurrentIndex = max - 1;
 		}
+
 		if (fCurrentIndex == startIndex) {
 			// we've gone completely through the list without finding
 			// a good app. Oh well.
@@ -900,6 +903,7 @@ TSwitchManager::_FindNextValidApp(bool forward)
 	return false;
 }
 
+
 void
 TSwitchManager::SwitchToApp(int32 previousIndex, int32 newIndex, bool forward)
 {
@@ -932,6 +936,7 @@ TSwitchManager::ActivateApp(bool forceShow, bool allowWorkspaceSwitch)
 
 	int32 currentWorkspace = current_workspace();
 	TTeamGroup* teamGroup = (TTeamGroup*)fGroupList.ItemAt(fCurrentIndex);
+
 	// Let's handle the easy case first: There's only 1 team in the group
 	if (teamGroup->TeamList()->CountItems() == 1) {
 		bool result;
@@ -990,7 +995,8 @@ TSwitchManager::ActivateApp(bool forceShow, bool allowWorkspaceSwitch)
 	if (tokens == NULL) {
 		ASSERT(windowInfo);
 		free(windowInfo);
-		return true;	// weird error, so don't try to recover
+		return true;
+			// weird error, so don't try to recover
 	}
 
 	BList windowsToActivate;
@@ -1042,6 +1048,7 @@ TSwitchManager::QuitApp()
 
 	TTeamGroup* teamGroup;
 	int32 count = 0;
+
 	for (int32 i = fCurrentIndex + 1; i < fGroupList.CountItems(); i++) {
 		teamGroup = (TTeamGroup*)fGroupList.ItemAt(i);
 
@@ -1296,7 +1303,7 @@ TBox::MouseDown(BPoint where)
 	if (fLeftScroller) {
 		BRect lhit(0, frame.top, frame.left, frame.bottom);
 		if (lhit.Contains(where)) {
-			// Want to scroll by NUMSLOTS-1 slots
+			// Want to scroll by NUMSLOTS - 1 slots
 			int32 previousIndex = fManager->CurrentIndex();
 			int32 previousSlot = fManager->CurrentSlot();
 			int32 newSlot = previousSlot - (kNumSlots - 1);
@@ -1311,16 +1318,16 @@ TBox::MouseDown(BPoint where)
 	if (fRightScroller) {
 		BRect rhit(frame.right, frame.top, bounds.right, frame.bottom);
 		if (rhit.Contains(where)) {
-			// Want to scroll by NUMSLOTS-1 slots
+			// Want to scroll by NUMSLOTS - 1 slots
 			int32 previousIndex = fManager->CurrentIndex();
 			int32 previousSlot = fManager->CurrentSlot();
-			int32 newSlot = previousSlot + (kNumSlots-1);
+			int32 newSlot = previousSlot + (kNumSlots - 1);
 			int32 newIndex = fIconView->IndexAt(newSlot);
 
 			if (newIndex < 0) {
 				// don't have a page full to scroll
 				int32 valid = fManager->CountVisibleGroups();
-				newIndex = fIconView->IndexAt(valid-1);
+				newIndex = fIconView->IndexAt(valid - 1);
 			}
 			fManager->SwitchToApp(previousIndex, newIndex, true);
 		}
@@ -1329,9 +1336,9 @@ TBox::MouseDown(BPoint where)
 	frame = fWindow->WindowView()->Frame();
 	if (fUpScroller) {
 		BRect hit1(frame.left - 10, frame.top, frame.left,
-			(frame.top+frame.bottom)/2);
+			(frame.top + frame.bottom) / 2);
 		BRect hit2(frame.right, frame.top, frame.right + 10,
-			(frame.top+frame.bottom)/2);
+			(frame.top + frame.bottom) / 2);
 		if (hit1.Contains(where) || hit2.Contains(where)) {
 			// Want to scroll up 1 window
 			fManager->CycleWindow(false, false);
@@ -1339,10 +1346,10 @@ TBox::MouseDown(BPoint where)
 	}
 
 	if (fDownScroller) {
-		BRect hit1(frame.left - 10, (frame.top+frame.bottom) / 2, frame.left,
-			frame.bottom);
-		BRect hit2(frame.right, (frame.top+frame.bottom) / 2, frame.right + 10,
-			frame.bottom);
+		BRect hit1(frame.left - 10, (frame.top + frame.bottom) / 2,
+			frame.left, frame.bottom);
+		BRect hit2(frame.right, (frame.top + frame.bottom) / 2,
+			frame.right + 10, frame.bottom);
 		if (hit1.Contains(where) || hit2.Contains(where)) {
 			// Want to scroll down 1 window
 			fManager->CycleWindow(true, false);
@@ -1374,40 +1381,42 @@ TBox::Draw(BRect update)
 
 	// Fill the area with dark gray
 	SetHighColor(darkGray);
-	box.InsetBy(1,1);
+	box.InsetBy(1, 1);
 	FillRect(box);
 
-	box.InsetBy(-1,-1);
+	box.InsetBy(-1, -1);
 
 	BeginLineArray(50);
 
 	// The main frame around the icon view
-	AddLine(box.LeftTop(), BPoint(center-kWedge, box.top), veryDarkGray);
-	AddLine(BPoint(center+kWedge, box.top), box.RightTop(), veryDarkGray);
+	AddLine(box.LeftTop(), BPoint(center - kWedge, box.top), veryDarkGray);
+	AddLine(BPoint(center + kWedge, box.top), box.RightTop(), veryDarkGray);
 
-	AddLine(box.LeftBottom(), BPoint(center-kWedge, box.bottom), veryDarkGray);
-	AddLine(BPoint(center+kWedge, box.bottom), box.RightBottom(), veryDarkGray);
+	AddLine(box.LeftBottom(), BPoint(center - kWedge, box.bottom),
+		veryDarkGray);
+	AddLine(BPoint(center + kWedge, box.bottom), box.RightBottom(),
+		veryDarkGray);
 	AddLine(box.LeftBottom() + BPoint(1, 1),
-		BPoint(center-kWedge, box.bottom + 1), white);
-	AddLine(BPoint(center+kWedge, box.bottom) + BPoint(0, 1),
+		BPoint(center - kWedge, box.bottom + 1), white);
+	AddLine(BPoint(center + kWedge, box.bottom) + BPoint(0, 1),
 		box.RightBottom() + BPoint(1, 1), white);
 
 	AddLine(box.LeftTop(), box.LeftBottom(), veryDarkGray);
 	AddLine(box.RightTop(), box.RightBottom(), veryDarkGray);
-	AddLine(box.RightTop() + BPoint(1, 1),
-		box.RightBottom() + BPoint(1, 1), white);
+	AddLine(box.RightTop() + BPoint(1, 1), box.RightBottom() + BPoint(1, 1),
+		white);
 
 	// downward pointing area at top of frame
 	BPoint point(center - kWedge, box.top);
 	AddLine(point, point + BPoint(kWedge, kWedge), veryDarkGray);
-	AddLine(point + BPoint(kWedge, kWedge),
-		BPoint(center+kWedge, point.y), veryDarkGray);
+	AddLine(point + BPoint(kWedge, kWedge), BPoint(center + kWedge, point.y),
+		veryDarkGray);
 
-	AddLine(point + BPoint(1, 0),
-		point + BPoint(1, 0) + BPoint(kWedge - 1, kWedge - 1), white);
+	AddLine(point + BPoint(1, 0), point + BPoint(1, 0)
+		+ BPoint(kWedge - 1, kWedge - 1), white);
 
 	AddLine(point + BPoint(2, -1) + BPoint(kWedge - 1, kWedge - 1),
-		BPoint(center+kWedge-1, point.y), darkGray);
+		BPoint(center + kWedge - 1, point.y), darkGray);
 
 	BPoint topPoint = point;
 
@@ -1416,7 +1425,7 @@ TBox::Draw(BRect update)
 	point.x = center - kWedge;
 	AddLine(point, point + BPoint(kWedge, -kWedge), veryDarkGray);
 	AddLine(point + BPoint(kWedge, -kWedge),
-		BPoint(center+kWedge, point.y), veryDarkGray);
+		BPoint(center + kWedge, point.y), veryDarkGray);
 
 	AddLine(point + BPoint(1, 0),
 		point + BPoint(1, 0) + BPoint(kWedge - 1, -(kWedge - 1)), white);
@@ -1436,7 +1445,7 @@ TBox::Draw(BRect update)
 
 	// fill the upward pointing arrow area
 	SetHighColor(standardGray);
-	FillTriangle(bottomPoint + BPoint(2,0),
+	FillTriangle(bottomPoint + BPoint(2, 0),
 		bottomPoint + BPoint(2, 0) + BPoint(kWedge - 2, -(kWedge - 2)),
 		BPoint(center + kWedge - 2, bottomPoint.y));
 
@@ -1467,7 +1476,7 @@ TBox::DrawIconScrollers(bool force)
 	}
 
 	int32 maxIndex = fManager->GroupList()->CountItems() - 1;
-			// last_frame is in fIconView coordinate space
+	// last_frame is in fIconView coordinate space
 	BRect lastFrame = fIconView->FrameOf(maxIndex);
 
 	if (lastFrame.right > rect.right) {
@@ -1893,7 +1902,7 @@ TIconView::CacheIcons(TTeamGroup* teamGroup)
 void
 TIconView::AnimateIcon(BBitmap* startIcon, BBitmap* endIcon)
 {
-	BRect centerRect(kCenterSlot*kSlotSize, 0,
+	BRect centerRect(kCenterSlot * kSlotSize, 0,
 		(kCenterSlot + 1) * kSlotSize - 1, kSlotSize - 1);
 	BRect startIconBounds = startIcon->Bounds();
 	BRect bounds = Bounds();
@@ -1917,7 +1926,7 @@ TIconView::AnimateIcon(BBitmap* startIcon, BBitmap* endIcon)
 	fOffBitmap->Lock();
 
 	for (int i = 0; i < 2; i++) {
-		startIconBounds.InsetBy(amount,amount);
+		startIconBounds.InsetBy(amount, amount);
 		snooze(20000);
 		fOffView->SetDrawingMode(B_OP_COPY);
 		fOffView->FillRect(fOffView->Bounds());
@@ -1927,7 +1936,7 @@ TIconView::AnimateIcon(BBitmap* startIcon, BBitmap* endIcon)
 		DrawBitmap(fOffBitmap, destRect);
 	}
 	for (int i = 0; i < 2; i++) {
-		startIconBounds.InsetBy(amount,amount);
+		startIconBounds.InsetBy(amount, amount);
 		snooze(20000);
 		fOffView->SetDrawingMode(B_OP_COPY);
 		fOffView->FillRect(fOffView->Bounds());
@@ -2054,6 +2063,7 @@ int32
 TIconView::SlotOf(int32 index) const
 {
 	BRect rect = FrameOf(index);
+
 	return (int32)(rect.left / kSlotSize) - kCenterSlot;
 }
 
@@ -2063,7 +2073,7 @@ TIconView::FrameOf(int32 index) const
 {
 	BList* list = fManager->GroupList();
 	int32 visible = kCenterSlot - 1;
-		// first few slots in view are empty
+	// first few slots in view are empty
 
 	TTeamGroup* teamGroup;
 	for (int32 i = 0; i <= index; i++) {
@@ -2107,7 +2117,7 @@ TIconView::DrawTeams(BRect update)
 
 			SetDrawingMode(B_OP_COPY);
 		}
-		rect.OffsetBy(kSlotSize,0);
+		rect.OffsetBy(kSlotSize, 0);
 	}
 }
 
@@ -2200,7 +2210,6 @@ TWindowView::ScrollTo(BPoint where)
 }
 
 
-
 BRect
 TWindowView::FrameOf(int32 index) const
 {
@@ -2274,6 +2283,7 @@ TWindowView::Draw(BRect update)
 	int32 groupIndex = fManager->CurrentIndex();
 	TTeamGroup* teamGroup
 		= (TTeamGroup*)fManager->GroupList()->ItemAt(groupIndex);
+
 	if (teamGroup == NULL)
 		return;
 
diff --git a/src/apps/deskbar/Switcher.h b/src/apps/deskbar/Switcher.h
index 9f319ea..b727c99 100644
--- a/src/apps/deskbar/Switcher.h
+++ b/src/apps/deskbar/Switcher.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 SWITCHER_H
@@ -53,7 +54,7 @@ public:
 							TSwitchManager(BPoint where);
 	virtual					~TSwitchManager();
 
-	virtual	void			MessageReceived(BMessage* message);
+	virtual void			MessageReceived(BMessage* message);
 
 			void			Stop(bool doAction, uint32 modifiers);
 			void			Unblock();
@@ -85,7 +86,7 @@ private:
 								bool allowWorkspaceSwitch);
 			void			ActivateWindow(int32 windowID = -1);
 			void			_SortApps();
-			
+
 			bool			_FindNextValidApp(bool forward);
 
 			TSwitcherWindow* fWindow;
diff --git a/src/apps/deskbar/TeamMenu.cpp b/src/apps/deskbar/TeamMenu.cpp
index 7814b40..3053969 100644
--- a/src/apps/deskbar/TeamMenu.cpp
+++ b/src/apps/deskbar/TeamMenu.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -121,7 +122,7 @@ TTeamMenu::AttachedToWindow()
 	if (dragging && barview->LockLooper()) {
 		SetTrackingHook(barview->MenuTrackingHook,
 			barview->GetTrackingHookData());
-		barview->DragStart();				
+		barview->DragStart();
 		barview->UnlockLooper();
 	}
 
diff --git a/src/apps/deskbar/TeamMenu.h b/src/apps/deskbar/TeamMenu.h
index b3b0487..a012a5e 100644
--- a/src/apps/deskbar/TeamMenu.h
+++ b/src/apps/deskbar/TeamMenu.h
@@ -26,15 +26,16 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
-//	listing of running applications
-//	menu of BarMenuTitle
-//	in mini mode only
+// listing of running applications
+// menu of BarMenuTitle
+// in mini mode only
 
 #ifndef TEAMMENU_H
 #define TEAMMENU_H
@@ -44,7 +45,7 @@ All rights reserved.
 #include "TeamMenuItem.h"
 
 class TTeamMenu : public BMenu {
-	public:					
+	public:
 		TTeamMenu();
 
 		void	AttachedToWindow();
diff --git a/src/apps/deskbar/TeamMenuItem.cpp b/src/apps/deskbar/TeamMenuItem.cpp
index cbd669f..5cdecdd 100644
--- a/src/apps/deskbar/TeamMenuItem.cpp
+++ b/src/apps/deskbar/TeamMenuItem.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -71,10 +72,11 @@ TTeamMenuItem::TTeamMenuItem(BList* team, BBitmap* icon, char* name, char* sig,
 }
 
 
-TTeamMenuItem::TTeamMenuItem(float width,float height,bool vertical)
+TTeamMenuItem::TTeamMenuItem(float width, float height, bool vertical)
 	:	BMenuItem("", NULL)
 {
-	InitData(NULL, NULL, strdup(""), strdup(""), width, height, false, vertical);
+	InitData(NULL, NULL, strdup(""), strdup(""), width, height, false,
+		vertical);
 }
 
 
@@ -136,10 +138,11 @@ TTeamMenuItem::Invoke(BMessage* message)
 		barview->DragStop();
 
 	// bring to front or minimize shortcuts
-	uint32 mods = modifiers();	
-	if (mods & B_CONTROL_KEY) 
+	uint32 mods = modifiers();
+	if (mods & B_CONTROL_KEY) {
 		TShowHideMenuItem::TeamShowHideCommon((mods & B_SHIFT_KEY)
 				? B_MINIMIZE_WINDOW : B_BRING_TO_FRONT, Teams());
+	}
 
 	return BMenuItem::Invoke(message);
 }
@@ -213,7 +216,7 @@ TTeamMenuItem::GetContentSize(float* width, float* height)
 		*width = kHPad + iconBounds.Width() + kLabelOffset + fLabelWidth + kHPad
 			+ 20;
 
-	if (fOverrideHeight != -1.0f) 
+	if (fOverrideHeight != -1.0f)
 		*height = fOverrideHeight;
 	else {
 		*height = iconBounds.Height();
@@ -233,8 +236,8 @@ TTeamMenuItem::Draw()
 	BMenu* menu = Menu();
 	menu->PushState();
 	rgb_color menuColor = menu->LowColor();
-
 	TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
+
 	bool canHandle = !barview->Dragging()
 		|| barview->AppCanHandleTypes(Signature());
 
@@ -314,13 +317,14 @@ TTeamMenuItem::Draw()
 
 		// these continue the dark grey border on the left or top edge
 		menu->SetHighColor(tint_color(menuColor, B_DARKEN_4_TINT));
-		if (fVertical)
+		if (fVertical) {
 			// dark line at top
 			menu->StrokeLine(frame.LeftTop(), frame.RightTop());
-		else
+		} else {
 			// dark line on the left
 			menu->StrokeLine(frame.LeftTop(), frame.LeftBottom());
-	} else 
+		}
+	} else
 		menu->SetLowColor(menuColor);
 
 	menu->MovePenTo(ContentLocation());
@@ -337,15 +341,15 @@ TTeamMenuItem::DrawContent()
 		if (fIcon->ColorSpace() == B_RGBA32) {
 			menu->SetDrawingMode(B_OP_ALPHA);
 			menu->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
-		} else {
+		} else
 			menu->SetDrawingMode(B_OP_OVER);
-		}
-		BRect frame(Frame());
 
+		BRect frame(Frame());
 		BRect iconBounds(fIcon->Bounds());
 		BRect dstRect(iconBounds);
 		float extra = fVertical ? 0.0f : 1.0f;
 		BPoint contLoc = ContentLocation();
+
 		dstRect.OffsetTo(BPoint(contLoc.x + kHPad, contLoc.y + 
 			((frame.Height() - iconBounds.Height()) / 2) + extra));
 		menu->DrawBitmapAsync(fIcon, dstRect);
@@ -357,17 +361,17 @@ TTeamMenuItem::DrawContent()
 		menu->MovePenTo(drawLoc);
 	}
 
-	//	set the pen to black so that either method will draw in the same color
-	//	low color is set in inherited::DrawContent, override makes sure its
-	//  what we want
+	// set the pen to black so that either method will draw in the same color
+	// low color is set in inherited::DrawContent, override makes sure its
+	// what we want
 	if (fDrawLabel) {
 		menu->SetDrawingMode(B_OP_OVER);
 		menu->SetHighColor(0, 0, 0);
 
-		//	override the drawing of the content when the item is disabled
-		//	the wrong lowcolor is used when the item is disabled since the
-		//	text color does not change
-		DrawContentLabel();	
+		// override the drawing of the content when the item is disabled
+		// the wrong lowcolor is used when the item is disabled since the
+		// text color does not change
+		DrawContentLabel();
 	}
 
 	// Draw the expandable icon.
@@ -387,42 +391,42 @@ TTeamMenuItem::DrawContent()
 		} else {
 			rgb_color outlineColor = {80, 80, 80, 255};
 			rgb_color middleColor = {200, 200, 200, 255};
-	
+
 			menu->SetDrawingMode(B_OP_OVER);
-	
+
 			if (!fExpanded) {
 				menu->BeginLineArray(6);
-	
-				menu->AddLine(BPoint(rect.left + 3, rect.top + 1), 
+
+				menu->AddLine(BPoint(rect.left + 3, rect.top + 1),
 					BPoint(rect.left + 3, rect.bottom - 1), outlineColor);
-				menu->AddLine(BPoint(rect.left + 3, rect.top + 1), 
+				menu->AddLine(BPoint(rect.left + 3, rect.top + 1),
 					BPoint(rect.left + 7, rect.top + 5), outlineColor);
-				menu->AddLine(BPoint(rect.left + 7, rect.top + 5), 
+				menu->AddLine(BPoint(rect.left + 7, rect.top + 5),
 					BPoint(rect.left + 3, rect.bottom - 1), outlineColor);
-	
-				menu->AddLine(BPoint(rect.left + 4, rect.top + 3), 
+
+				menu->AddLine(BPoint(rect.left + 4, rect.top + 3),
 					BPoint(rect.left + 4, rect.bottom - 3), middleColor);
-				menu->AddLine(BPoint(rect.left + 5, rect.top + 4), 
+				menu->AddLine(BPoint(rect.left + 5, rect.top + 4),
 					BPoint(rect.left + 5, rect.bottom - 4), middleColor);
-				menu->AddLine(BPoint(rect.left + 5, rect.top + 5), 
+				menu->AddLine(BPoint(rect.left + 5, rect.top + 5),
 					BPoint(rect.left + 6, rect.top + 5), middleColor);
 				menu->EndLineArray();
 			} else {
 				// expanded state
-	
+
 				menu->BeginLineArray(6);
-				menu->AddLine(BPoint(rect.left + 1, rect.top + 3), 
+				menu->AddLine(BPoint(rect.left + 1, rect.top + 3),
 					BPoint(rect.right - 3, rect.top + 3), outlineColor);
-				menu->AddLine(BPoint(rect.left + 1, rect.top + 3), 
+				menu->AddLine(BPoint(rect.left + 1, rect.top + 3),
 					BPoint(rect.left + 5, rect.top + 7), outlineColor);
-				menu->AddLine(BPoint(rect.left + 5, rect.top + 7), 
+				menu->AddLine(BPoint(rect.left + 5, rect.top + 7),
 					BPoint(rect.right - 3, rect.top + 3), outlineColor);
-	
-				menu->AddLine(BPoint(rect.left + 3, rect.top + 4), 
+
+				menu->AddLine(BPoint(rect.left + 3, rect.top + 4),
 					BPoint(rect.right - 5, rect.top + 4), middleColor);
-				menu->AddLine(BPoint(rect.left + 4, rect.top + 5), 
+				menu->AddLine(BPoint(rect.left + 4, rect.top + 5),
 					BPoint(rect.right - 6, rect.top + 5), middleColor);
-				menu->AddLine(BPoint(rect.left + 5, rect.top + 5), 
+				menu->AddLine(BPoint(rect.left + 5, rect.top + 5),
 					BPoint(rect.left + 5, rect.top + 6), middleColor);
 				menu->EndLineArray();
 			}
@@ -437,23 +441,24 @@ TTeamMenuItem::DrawContentLabel()
 	BMenu* menu = Menu();
 	menu->MovePenBy(0, fLabelAscent);
 
-	float cachedWidth = menu->StringWidth(Label());	
+	float cachedWidth = menu->StringWidth(Label());
 	if (Submenu() && fVertical)
 		cachedWidth += 18;
 
 	const char* label = Label();
 	char* truncLabel = NULL;
 	float max = 0;
+
 	if (static_cast<TBarApp*>(be_app)->Settings()->superExpando && fVertical)
 		max = menu->MaxContentWidth() - kSwitchWidth;
 	else
 		max = menu->MaxContentWidth();
 
 	if (max > 0) {
- 		BPoint penloc = menu->PenLocation();
+		BPoint penloc = menu->PenLocation();
 		BRect frame = Frame();
 		float offset = penloc.x - frame.left;
-	 	if (cachedWidth + offset > max) {
+		if (cachedWidth + offset > max) {
 			truncLabel = (char*)malloc(strlen(label) + 4);
 			if (!truncLabel)
 				return;
@@ -491,7 +496,7 @@ void
 TTeamMenuItem::ToggleExpandState(bool resizeWindow)
 {
 	fExpanded = !fExpanded;
-	
+
 	if (fExpanded) {
 		// Populate Menu() with the stuff from SubMenu().
 		TWindowMenu* sub = (static_cast<TWindowMenu*>(Submenu()));
@@ -503,7 +508,7 @@ TTeamMenuItem::ToggleExpandState(bool resizeWindow)
 			if (locked)
 				sub->UnlockLooper();
 
-			if (sub->CountItems() > 1){
+			if (sub->CountItems() > 1) {
 				TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());
 				int myindex = parent->IndexOf(this) + 1;
 
@@ -553,8 +558,10 @@ TTeamMenuItem::ToggleExpandState(bool resizeWindow)
 TWindowMenuItem*
 TTeamMenuItem::ExpandedWindowItem(int32 id)
 {
-	if (!fExpanded)	// Paranoia
+	if (!fExpanded) {
+		// Paranoia
 		return NULL;
+	}
 
 	TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());
 	int childIndex = parent->IndexOf(this) + 1;
diff --git a/src/apps/deskbar/TeamMenuItem.h b/src/apps/deskbar/TeamMenuItem.h
index efcd7d0..9bfd28b 100644
--- a/src/apps/deskbar/TeamMenuItem.h
+++ b/src/apps/deskbar/TeamMenuItem.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 TEAMMENUITEM_H
@@ -53,7 +54,7 @@ class TTeamMenuItem : public BMenuItem {
 			float width = -1.0f, float height = -1.0f,
 			bool drawLabel = true, bool vertical = true);
 		TTeamMenuItem(float width = -1.0f, float height = -1.0f,
-			bool vertical=true);
+			bool vertical = true);
 		virtual ~TTeamMenuItem();
 
 		status_t Invoke(BMessage* msg = NULL);
@@ -82,7 +83,7 @@ class TTeamMenuItem : public BMenuItem {
 		friend class TExpandoMenuBar;
 		void InitData(BList* team, BBitmap* icon, char* name, char* sig,
 			float width = -1.0f, float height = -1.0f,
-			bool drawLabel = true,bool vertical=true);
+			bool drawLabel = true, bool vertical = true);
 
 		bool _IsSelected() const;
 
diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp
index 16c4982..1c141b4 100644
--- a/src/apps/deskbar/TimeView.cpp
+++ b/src/apps/deskbar/TimeView.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -154,9 +155,9 @@ TTimeView::GetPreferredSize(float* width, float* height)
 
 	GetCurrentTime();
 
-	// TODO: SetOrientation never gets called, fix that
-	// When in vertical mode, we want to limit the width so that it can't
-	// overlap the bevels in the parent view.
+	// TODO: SetOrientation never gets called, fix that when in vertical mode,
+	// we want to limit the width so that it can't overlap the bevels in the
+	// parent view.
 	*width = fOrientation ?
 		min_c(fMaxWidth - kHMargin, kHMargin + StringWidth(fTimeStr))
 		: kHMargin + StringWidth(fTimeStr);
@@ -217,6 +218,7 @@ TTimeView::MessageReceived(BMessage* message)
 
 		default:
 			BView::MessageReceived(message);
+			break;
 	}
 }
 
@@ -262,8 +264,8 @@ TTimeView::GetCurrentDate()
 
 	fLocale.FormatDate(tmp, 64, fTime, B_FULL_DATE_FORMAT);
 
-	//	remove leading 0 from date when month is less than 10 (MM/DD/YY)
-	//  or remove leading 0 from date when day is less than 10 (DD/MM/YY)
+	// remove leading 0 from date when month is less than 10 (MM/DD/YY)
+	// or remove leading 0 from date when day is less than 10 (DD/MM/YY)
 	const char* str = tmp;
 	if (str[0] == '0')
 		str++;
@@ -325,7 +327,7 @@ TTimeView::Pulse()
 		// For dates, Update() could be called two times in a row,
 		// but that should only happen very rarely
 		if ((fLastTimeStr[1] != fTimeStr[1]
-				&& (fLastTimeStr[1] == ':' || fTimeStr[1] == ':'))
+			&& (fLastTimeStr[1] == ':' || fTimeStr[1] == ':'))
 			|| !fLastTimeStr[0])
 			Update();
 
@@ -361,7 +363,6 @@ TTimeView::Update()
 	GetCurrentTime();
 	GetCurrentDate();
 
-
 	SetToolTip(fDateStr);
 
 	ResizeToPreferred();
diff --git a/src/apps/deskbar/TimeView.h b/src/apps/deskbar/TimeView.h
index 6034fb0..f71c052 100644
--- a/src/apps/deskbar/TimeView.h
+++ b/src/apps/deskbar/TimeView.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 TIME_VIEW_H
@@ -73,7 +74,7 @@ class TTimeView : public BView {
 		void		MouseDown(BPoint where);
 		void		Pulse();
 
-		bool		ShowingSeconds() 	{ return fShowSeconds; }
+		bool		ShowingSeconds() { return fShowSeconds; }
 		void		ShowSeconds(bool);
 		void		ShowCalendar(BPoint where);
 
@@ -110,7 +111,7 @@ class TTimeView : public BView {
 
 		float		fMaxWidth;
 		float		fHeight;
-		bool		fOrientation;		// vertical = true
+		bool		fOrientation; // vertical = true
 		BPoint		fTimeLocation;
 		BPoint		fDateLocation;
 
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index 895b890..59e31fc 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -88,16 +89,14 @@ void
 TWindowMenu::AttachedToWindow()
 {
 	SetFont(be_plain_font);
-
 	RemoveItems(0, CountItems(), true);
-
 	int32 miniCount = 0;
 
 	bool dragging = false;
 	TBarView* barview =(static_cast<TBarApp*>(be_app))->BarView();
 	if (barview && barview->LockLooper()) {
-		//	'dragging' mode set in BarView::CacheDragData
-		//		invoke in MouseEnter in ExpandoMenuBar
+		// 'dragging' mode set in BarView::CacheDragData
+		// invoke in MouseEnter in ExpandoMenuBar
 		dragging = barview->Dragging();
 		if (dragging) {
 			// We don't want to show the menu when dragging, but it's not
@@ -105,7 +104,7 @@ TWindowMenu::AttachedToWindow()
 			// Don't call BMenu::Hide(), it causes the menu to pop up every now
 			// and then.
 			Window()->Hide();
-			//	if in expando (horizontal or vertical)
+			// if in expando (horizontal or vertical)
 			if (barview->Expando()) {
 				SetTrackingHook(barview->MenuTrackingHook,
 					barview->GetTrackingHookData());
@@ -177,8 +176,8 @@ TWindowMenu::AttachedToWindow()
 
 	int32 itemCount = CountItems() + parentMenuItems;
 	if (itemCount < 1) {
-		TWindowMenuItem* noWindowsItem =
- 			new TWindowMenuItem(B_TRANSLATE("No windows"), -1, false, false);
+		TWindowMenuItem* noWindowsItem
+			= new TWindowMenuItem(B_TRANSLATE("No windows"), -1, false, false);
 
 		noWindowsItem->SetEnabled(false);
 
@@ -186,23 +185,23 @@ TWindowMenu::AttachedToWindow()
 
 		// if an application has no windows, this feature makes it easy to quit
 		// it. (but we only add this option if the application is not Tracker.)
- 		if (fApplicationSignature.ICompare(kTrackerSignature) != 0) {
+		if (fApplicationSignature.ICompare(kTrackerSignature) != 0) {
 			AddSeparatorItem();
 			AddItem(new TShowHideMenuItem(B_TRANSLATE("Quit application"),
 				fTeam, B_QUIT_REQUESTED));
- 		}
+		}
 	} else {
-		//	if we are in drag mode, then don't add the window controls
-		//	to the menu
+		// if we are in drag mode, then don't add the window controls
+		// to the menu
 		if (!dragging) {
-			TShowHideMenuItem* hide =
-				new TShowHideMenuItem(B_TRANSLATE("Hide all"), fTeam,
+			TShowHideMenuItem* hide
+				= new TShowHideMenuItem(B_TRANSLATE("Hide all"), fTeam,
 					B_MINIMIZE_WINDOW);
-			TShowHideMenuItem* show =
-				new TShowHideMenuItem(B_TRANSLATE("Show all"), fTeam,
+			TShowHideMenuItem* show
+				= new TShowHideMenuItem(B_TRANSLATE("Show all"), fTeam,
 					B_BRING_TO_FRONT);
-			TShowHideMenuItem* close =
-				new TShowHideMenuItem(B_TRANSLATE("Close all"), fTeam,
+			TShowHideMenuItem* close
+				= new TShowHideMenuItem(B_TRANSLATE("Close all"), fTeam,
 					B_QUIT_REQUESTED);
 
 			if (miniCount == itemCount)
@@ -212,6 +211,7 @@ TWindowMenu::AttachedToWindow()
 
 			if (!parentMenuItems)
 				AddSeparatorItem();
+
 			AddItem(hide);
 			AddItem(show);
 			AddItem(close);
@@ -225,12 +225,12 @@ TWindowMenu::AttachedToWindow()
 void
 TWindowMenu::DetachedFromWindow()
 {
-	// in expando mode the teammenu will not call DragStop,
-	// thus, it needs to be called from here
+	// in expando mode the teammenu will not call DragStop, thus, it needs to
+	// be called from here
 	TBarView* barview = (dynamic_cast<TBarApp*>(be_app))->BarView();
 	if (barview && barview->Expando() && barview->Dragging()
 		&& barview->LockLooper()) {
-		// We changed the show level in AttachedToWindow().  Undo it.
+		// We changed the show level in AttachedToWindow(). Undo it.
 		Window()->Show();
 		barview->DragStop();
 		barview->UnlockLooper();
diff --git a/src/apps/deskbar/WindowMenu.h b/src/apps/deskbar/WindowMenu.h
index 108f688..4204c07 100644
--- a/src/apps/deskbar/WindowMenu.h
+++ b/src/apps/deskbar/WindowMenu.h
@@ -26,15 +26,16 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
-//	list of windows for a specific application
-//	always submenu for a TeamMenuItem
-//	all DB positions
+// list of windows for a specific application
+// always submenu for a TeamMenuItem
+// all DB positions
 
 #ifndef WINDOWMENU_H
 #define WINDOWMENU_H
diff --git a/src/apps/deskbar/WindowMenuItem.cpp b/src/apps/deskbar/WindowMenuItem.cpp
index ddf94f4..3e23585 100644
--- a/src/apps/deskbar/WindowMenuItem.cpp
+++ b/src/apps/deskbar/WindowMenuItem.cpp
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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.
 */
 
@@ -48,10 +49,10 @@ All rights reserved.
 #include "WindowMenu.h"
 
 
-const float	kHPad = 10.0f;
-const float	kVPad = 2.0f;
-const float	kLabelOffset = 8.0f;
-const BRect	kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
+const float kHPad = 10.0f;
+const float kVPad = 2.0f;
+const float kLabelOffset = 8.0f;
+const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
 
 
 TWindowMenuItem::TWindowMenuItem(const char* title, int32 id, bool mini,
@@ -75,11 +76,11 @@ void
 TWindowMenuItem::Initialize(const char* title)
 {
 	if (fMini) {
- 		fBitmap = fCurrentWorkSpace
+		fBitmap = fCurrentWorkSpace
 			? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenIcon)
 			: AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenSwitchIcon);
 	} else {
- 		fBitmap = fCurrentWorkSpace
+		fBitmap = fCurrentWorkSpace
 			? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownIcon)
 			: AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownSwitchIcon);
 	}
@@ -204,7 +205,7 @@ TWindowMenuItem::Draw()
 
 	menu->PushState();
 
-	//	if not selected or being tracked on, fill with gray
+	// if not selected or being tracked on, fill with gray
 	TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
 	if ((!IsSelected() && !menu->IsRedrawAfterSticky())
 		|| barview->Dragging() || !IsEnabled()) {
@@ -241,8 +242,8 @@ TWindowMenuItem::DrawContent()
 
 	BRect frame(Frame());
 	BPoint contLoc = ContentLocation() + BPoint(kHPad, kVPad);
-//	if (fExpanded)
-//		contLoc.x += kHPad;
+	//if (fExpanded)
+	//	contLoc.x += kHPad;
 
 	if (fID >= 0) {
 		menu->SetDrawingMode(B_OP_OVER);
diff --git a/src/apps/deskbar/WindowMenuItem.h b/src/apps/deskbar/WindowMenuItem.h
index bfe14da..d777b73 100644
--- a/src/apps/deskbar/WindowMenuItem.h
+++ b/src/apps/deskbar/WindowMenuItem.h
@@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks 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 WINDOWMENUITEM_H
@@ -69,7 +70,7 @@ public:
 
 protected:
 			void				Initialize(const char* title);
-	virtual	void				GetContentSize(float* width, float* height);
+	virtual void				GetContentSize(float* width, float* height);
 	virtual void				DrawContent();
 	virtual status_t			Invoke(BMessage* message = NULL);
 	virtual void				Draw();
@@ -91,3 +92,4 @@ private:
 
 
 #endif	/* WINDOWMENUITEM_H */
+
