diff --git a/src/servers/app/CursorManager.cpp b/src/servers/app/CursorManager.cpp
index 6589dfbe71..72d3c15c35 100644
--- a/src/servers/app/CursorManager.cpp
+++ b/src/servers/app/CursorManager.cpp
@@ -38,7 +38,7 @@
 CursorManager *cursormanager;
 
 //! Initializes the CursorManager
-CursorManager::CursorManager(void)
+CursorManager::CursorManager()
 {
 	// Error code for AddCursor
 	fTokenizer.ExcludeValue(B_ERROR);
@@ -83,7 +83,7 @@ CursorManager::CursorManager(void)
 }
 
 //! Does all the teardown
-CursorManager::~CursorManager(void)
+CursorManager::~CursorManager()
 {
 	ServerCursor *temp;
 	for(int32 i=0; i<fCursorList.CountItems();i++)
@@ -336,7 +336,7 @@ cursor_which CursorManager::GetCursorWhich(void)
 	
 	A word of warning: once a cursor has been assigned to the system, the
 	system will take ownership of the cursor and deleting the cursor
-	will have not effect on the system.
+	will have no effect on the system.
 */
 void CursorManager::ChangeCursor(cursor_which which, int32 token)
 {
diff --git a/src/servers/app/CursorManager.h b/src/servers/app/CursorManager.h
index 69111ae6d9..2fa6009241 100644
--- a/src/servers/app/CursorManager.h
+++ b/src/servers/app/CursorManager.h
@@ -43,36 +43,35 @@ class ServerCursor;
 	any BeOS platform. It also provides tokens for BCursors and frees all
 	of an application's cursors whenever an application closes.
 */
-class CursorManager : public BLocker
-{
+class CursorManager : public BLocker {
 public:
-	CursorManager(void);
-	~CursorManager(void);
-	int32 AddCursor(ServerCursor *sc);
-	void DeleteCursor(int32 token);
-	void RemoveAppCursors(team_id team);
-	void SetCursorSet(const char *path);
-	ServerCursor *GetCursor(cursor_which which);
-	cursor_which GetCursorWhich(void);
-	void ChangeCursor(cursor_which which, int32 token);
-	void SetDefaults(void);
-	ServerCursor *FindCursor(int32 token);
+						CursorManager();
+						~CursorManager();
+		int32			AddCursor(ServerCursor *sc);
+		void			DeleteCursor(int32 token);
+		void			RemoveAppCursors(team_id team);
+		void			SetCursorSet(const char *path);
+		ServerCursor	*GetCursor(cursor_which which);
+		cursor_which	GetCursorWhich(void);
+		void			ChangeCursor(cursor_which which, int32 token);
+		void			SetDefaults(void);
+		ServerCursor	*FindCursor(int32 token);
 
 private:
-	BList fCursorList;
-	TokenHandler fTokenizer;
+		BList			fCursorList;
+		TokenHandler	fTokenizer;
 
-	// System cursor members
-	ServerCursor 	*fDefaultCursor,
-					*fTextCursor,
-					*fMoveCursor,
-					*fDragCursor,
-					*fResizeCursor,
-					*fNWSECursor,
-					*fNESWCursor,
-					*fNSCursor,
-					*fEWCursor;
-	cursor_which fCurrentWhich;
+		// System cursor members
+		ServerCursor	*fDefaultCursor,
+						*fTextCursor,
+						*fMoveCursor,
+						*fDragCursor,
+						*fResizeCursor,
+						*fNWSECursor,
+						*fNESWCursor,
+						*fNSCursor,
+						*fEWCursor;
+		cursor_which	fCurrentWhich;
 };
 
 extern CursorManager *cursormanager;
diff --git a/src/servers/app/DebugInfoManager.h b/src/servers/app/DebugInfoManager.h
index 1d17a781b7..547718612e 100644
--- a/src/servers/app/DebugInfoManager.h
+++ b/src/servers/app/DebugInfoManager.h
@@ -26,21 +26,21 @@
 #endif // ON_SCREEN_DEBUGGING_INFO
 
 class DebugInfoManager {
- public:
-	virtual						~DebugInfoManager();
+public:
+virtual						~DebugInfoManager();
 
-	static	DebugInfoManager*	Default();
-			void				AddInfo(const char* string);
+static	DebugInfoManager	*Default();
+		void				AddInfo(const char* string);
 
- private:
-								DebugInfoManager();
-	static	DebugInfoManager*	sDefaultInstance;
+private:
+							DebugInfoManager();
+static	DebugInfoManager	*sDefaultInstance;
 
 #if ON_SCREEN_DEBUGGING_INFO
-	friend	class	RootLayer;
-			void				SetRootLayer(RootLayer* layer);
+friend	class RootLayer;
+		void				SetRootLayer(RootLayer* layer);
 
-			RootLayer*			fRootLayer;
+		RootLayer			*fRootLayer;
 #endif // ON_SCREEN_DEBUGGING_INFO
 };