diff --git a/headers/os/app/Invoker.h b/headers/os/app/Invoker.h
index 13e8402148..74b6fa5e93 100644
--- a/headers/os/app/Invoker.h
+++ b/headers/os/app/Invoker.h
@@ -12,6 +12,7 @@
 #include <BeBuild.h>
 #include <Messenger.h>
 
+
 class BHandler;
 class BLooper;
 class BMessage;
@@ -19,51 +20,54 @@ class BMessage;
 
 class BInvoker {
 public:
-						BInvoker(); 
-						BInvoker(BMessage* message, const BHandler* handler,
-							 const BLooper* looper = NULL);
-						BInvoker(BMessage* message, BMessenger target);
-	virtual				~BInvoker();
+								BInvoker();
+								BInvoker(BMessage* message,
+									const BHandler* handler,
+									const BLooper* looper = NULL);
+								BInvoker(BMessage* message, BMessenger target);
+	virtual						~BInvoker();
 
-	virtual	status_t	SetMessage(BMessage *message);
-			BMessage*	Message() const;
-			uint32		Command() const;
+	virtual	status_t			SetMessage(BMessage* message);
+			BMessage*			Message() const;
+			uint32				Command() const;
 
-	virtual	status_t	SetTarget(const BHandler *handler,
-							const BLooper *looper = NULL);
-	virtual	status_t	SetTarget(BMessenger messenger);
-			bool		IsTargetLocal() const;
-			BHandler*	Target(BLooper** _looper = NULL) const;
-			BMessenger	Messenger() const;
+	virtual	status_t			SetTarget(const BHandler* handler,
+									const BLooper* looper = NULL);
+	virtual	status_t			SetTarget(BMessenger messenger);
+			bool				IsTargetLocal() const;
+			BHandler*			Target(BLooper** _looper = NULL) const;
+			BMessenger			Messenger() const;
 
-	virtual	status_t	SetHandlerForReply(BHandler* handler);
-			BHandler*	HandlerForReply() const;
+	virtual	status_t			SetHandlerForReply(BHandler* handler);
+			BHandler*			HandlerForReply() const;
 
-	virtual	status_t	Invoke(BMessage* message = NULL);
-			status_t	InvokeNotify(BMessage* message,
-							uint32 kind = B_CONTROL_INVOKED);
-			status_t	SetTimeout(bigtime_t timeout);
-			bigtime_t	Timeout() const;
+	virtual	status_t			Invoke(BMessage* message = NULL);
+			status_t			InvokeNotify(BMessage* message,
+									uint32 kind = B_CONTROL_INVOKED);
+			status_t			SetTimeout(bigtime_t timeout);
+			bigtime_t			Timeout() const;
 
 protected:
-			uint32		InvokeKind(bool* _notify = NULL);
-			void		BeginInvokeNotify(uint32 kind = B_CONTROL_INVOKED);
-			void		EndInvokeNotify();
+			uint32				InvokeKind(bool* _notify = NULL);
+			void				BeginInvokeNotify(
+									uint32 kind = B_CONTROL_INVOKED);
+			void				EndInvokeNotify();
 
 private:
-	virtual	void		_ReservedInvoker1();
-	virtual	void		_ReservedInvoker2();
-	virtual	void		_ReservedInvoker3();
+	virtual	void				_ReservedInvoker1();
+	virtual	void				_ReservedInvoker2();
+	virtual	void				_ReservedInvoker3();
 
-						BInvoker(const BInvoker&);
-			BInvoker&	operator=(const BInvoker&);
+								BInvoker(const BInvoker&);
+			BInvoker&			operator=(const BInvoker&);
 
-			BMessage*	fMessage;
-			BMessenger	fMessenger;
-			BHandler*	fReplyTo;
-			bigtime_t	fTimeout;
-			uint32		fNotifyKind;
-			uint32		_reserved[1];
+			BMessage*			fMessage;
+			BMessenger			fMessenger;
+			BHandler*			fReplyTo;
+			bigtime_t			fTimeout;
+			uint32				fNotifyKind;
+			uint32				_reserved[1];
 };
 
+
 #endif	// _INVOKER_H
diff --git a/src/kits/app/Invoker.cpp b/src/kits/app/Invoker.cpp
index 5a7fcccc4b..087bb917b0 100644
--- a/src/kits/app/Invoker.cpp
+++ b/src/kits/app/Invoker.cpp
@@ -62,7 +62,7 @@ BInvoker::SetMessage(BMessage* message)
 }
 
 
-BMessage *
+BMessage*
 BInvoker::Message() const
 {
 	return fMessage;
@@ -124,7 +124,7 @@ BInvoker::SetHandlerForReply(BHandler* replyHandler)
 }
 
 
-BHandler *
+BHandler*
 BInvoker::HandlerForReply() const
 {
 	return fReplyTo;