@@ -123,12 +123,12 @@
  * @ref OFApplicationDelegate::applicationDidFinishLaunching.
  */
 @interface OFApplication: OFObject
 {
 	OFString *_programName;
-	OFArray OF_GENERIC(OFString*) *_arguments;
-	OFDictionary OF_GENERIC(OFString*, OFString*) *_environment;
+	OFArray OF_GENERIC(OFString *) *_arguments;
+	OFDictionary OF_GENERIC(OFString *, OFString *) *_environment;
 	int *_argc;
 	char ***_argv;
 @public
 	id <OFApplicationDelegate> _delegate;
 	void (*_SIGINTHandler)(id, SEL);
@@ -145,45 +145,45 @@
 @property (readonly, nonatomic) OFString *programName;
 
 /*!
  * The arguments passed to the application.
  */
-@property (readonly, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
+@property (readonly, nonatomic) OFArray OF_GENERIC(OFString *) *arguments;
 
 /*!
  * The environment of the application.
  */
 @property (readonly, nonatomic)
-    OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
+    OFDictionary OF_GENERIC(OFString *, OFString *) *environment;
 
 /*!
  * @brief Returns the only OFApplication instance in the application.
  *
  * @return The only OFApplication instance in the application
  */
-+ (OFApplication*)sharedApplication;
++ (OFApplication *)sharedApplication;
 
 /*!
  * @brief Returns the name of the program (argv[0]).
  *
  * @return The name of the program (argv[0])
  */
-+ (OFString*)programName;
++ (OFString *)programName;
 
 /*!
  * @brief Returns the arguments passed to the application.
  *
  * @return The arguments passed to the application
  */
-+ (OFArray OF_GENERIC(OFString*)*)arguments;
++ (OFArray OF_GENERIC(OFString *) *)arguments;
 
 /*!
  * @brief Returns the environment of the application.
  *
  * @return The environment of the application
  */
-+ (OFDictionary OF_GENERIC(OFString*, OFString*)*)environment;
++ (OFDictionary OF_GENERIC(OFString *, OFString *) *)environment;
 
 /*!
  * @brief Terminates the application with the EXIT_SUCCESS status.
  */
 + (void)terminate OF_NO_RETURN;
@@ -201,11 +201,11 @@
  *
  * This is only available if `OF_HAVE_SANDBOX` is defined.
  *
  * @param sandbox The sandbox to activate
  */
-+ (void)activateSandbox: (OFSandbox*)sandbox;
++ (void)activateSandbox: (OFSandbox *)sandbox;
 #endif
 
 /*!
  * @brief Gets argc and argv.
  *
@@ -247,11 +247,11 @@
  *
  * This is only available if `OF_HAVE_SANDBOX` is defined.
  *
  * @param sandbox The sandbox to activate
  */
-- (void)activateSandbox: (OFSandbox*)sandbox;
+- (void)activateSandbox: (OFSandbox *)sandbox;
 #endif
 @end
 
 #ifdef __cplusplus
 extern "C" {