diff --git a/src/apps/deskbar/BeMenu.h b/src/apps/deskbar/BeMenu.h
index 276275d709..70abe610b3 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
@@ -69,15 +70,15 @@ class TRecentsMenu : public BNavMenu {
 
 	private:
 		int32			fWhich;
-		entry_ref		*fAppRef;
-		char			*fSignature;
+		entry_ref*		fAppRef;
+		char*			fSignature;
 		int32			fRecentsCount;
 		bool			fRecentsEnabled;
 
 		int32 			fItemIndex;
 		BMessage		fRecentList;
-		
-		TBarView		*fBarView;
+
+		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 7cdbb6154b..c7af6d15cd 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 57b627eabc..1ac0a78d7c 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 151fd609d0..791a809842 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 1f05c83215..b35ad567a6 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.
 */