diff --git a/src/servers/app/EventDispatcher.cpp b/src/servers/app/EventDispatcher.cpp
index 9492101e5a..58bfc4386a 100644
--- a/src/servers/app/EventDispatcher.cpp
+++ b/src/servers/app/EventDispatcher.cpp
@@ -132,8 +132,10 @@ EventTarget::_RemoveTemporaryListener(event_listener* listener, int32 index)
 	}
 
 	if (listener->temporary_event_mask != 0) {
-		ETRACE(("events: clear temp. listener: token %ld, eventMask = %ld, options = %ld\n",
-			listener->token, listener->temporary_event_mask, listener->temporary_options));
+		ETRACE(("events: clear temp. listener: token %ld, eventMask = %ld, "
+				"options = %ld\n",
+			listener->token, listener->temporary_event_mask,
+			listener->temporary_options));
 
 		listener->temporary_event_mask = 0;
 		listener->temporary_options = 0;
@@ -230,7 +232,8 @@ EventFilter::RemoveTarget(EventTarget* target)
 
 
 EventDispatcher::EventDispatcher()
-	: BLocker("event dispatcher"),
+	:
+	BLocker("event dispatcher"),
 	fStream(NULL),
 	fThread(-1),
 	fCursorThread(-1),
@@ -390,7 +393,8 @@ EventDispatcher::_AddListener(EventTarget& target, int32 token,
 	if (eventMask == 0)
 		return false;
 
-	ETRACE(("events: add listener: token %ld, eventMask = %ld, options = %ld, %s\n",
+	ETRACE(("events: add listener: token %ld, eventMask = %ld, options = %ld,"
+			"%s\n",
 		token, eventMask, options, temporary ? "temporary" : "permanent"));
 
 	// we need a new target
@@ -905,8 +909,10 @@ EventDispatcher::_EventLoop()
 				ETRACE(("key event, focus = %p\n", fFocus));
 
 				if (fKeyboardFilter != NULL
-					&& fKeyboardFilter->Filter(event, &fFocus) == B_SKIP_MESSAGE)
+					&& fKeyboardFilter->Filter(event, &fFocus)
+						== B_SKIP_MESSAGE) {
 					break;
+				}
 
 				keyboardEvent = true;
 
@@ -1007,12 +1013,12 @@ EventDispatcher::_CursorLoop()
 	const bigtime_t toolTipDelay = BToolTipManager::Manager()->ShowDelay();	
 	bool mouseIdleSent = true;
 	status_t status = B_OK;
-	
+
 	while (status != B_ERROR) {
 		const bigtime_t timeout = mouseIdleSent ?
 			B_INFINITE_TIMEOUT : toolTipDelay;
 		status = fStream->GetNextCursorPosition(where, timeout);
-		
+
 		if (status == B_OK) {
 			mouseIdleSent = false;
 			BAutolock _(fCursorLock);
diff --git a/src/servers/app/EventDispatcher.h b/src/servers/app/EventDispatcher.h
index 656234ddbb..aff524b6a9 100644
--- a/src/servers/app/EventDispatcher.h
+++ b/src/servers/app/EventDispatcher.h
@@ -106,8 +106,9 @@ class EventDispatcher : public BLocker {
 		bool _SendMessage(BMessenger& messenger, BMessage* message,
 				float importance);
 
-		bool _AddTokens(BMessage* message, EventTarget* target, uint32 eventMask,
-				BMessage* nextMouseMoved = NULL, int32* _viewToken = NULL);
+		bool _AddTokens(BMessage* message, EventTarget* target,
+				uint32 eventMask, BMessage* nextMouseMoved = NULL,
+				int32* _viewToken = NULL);
 		void _RemoveTokens(BMessage* message);
 		void _SetFeedFocus(BMessage* message);
 		void _UnsetFeedFocus(BMessage* message);