diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index c7c0d6c5..785cd267 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -109,7 +109,7 @@ static NSString* findAppName(void)
     char** progname = _NSGetProgname();
     if (progname && *progname)
     {
-        // TODO: UTF8?
+        // TODO: UTF-8?
         return [NSString stringWithUTF8String:*progname];
     }
 
@@ -202,7 +202,7 @@ int _glfwPlatformInit(void)
     [GLFWApplication sharedApplication];
 
     _glfwLibrary.NS.OpenGLFramework =
-        CFBundleGetBundleWithIdentifier( CFSTR( "com.apple.opengl" ) );
+        CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
     if (_glfwLibrary.NS.OpenGLFramework == NULL)
     {
         _glfwSetError(GLFW_PLATFORM_ERROR,
@@ -229,7 +229,7 @@ int _glfwPlatformInit(void)
     _glfwLibrary.originalRampSize = CGDisplayGammaTableCapacity(CGMainDisplayID());
     _glfwPlatformGetGammaRamp(&_glfwLibrary.originalRamp);
     _glfwLibrary.currentRamp = _glfwLibrary.originalRamp;
-    
+
     return GL_TRUE;
 }
 
@@ -240,10 +240,10 @@ int _glfwPlatformInit(void)
 int _glfwPlatformTerminate(void)
 {
     // TODO: Probably other cleanup
-    
+
     // Restore the original gamma ramp
     _glfwPlatformSetGammaRamp(&_glfwLibrary.originalRamp);
-    
+
     [NSApp setDelegate:nil];
     [_glfwLibrary.NS.delegate release];
     _glfwLibrary.NS.delegate = nil;
diff --git a/src/x11_window.c b/src/x11_window.c
index effff0f9..61e39583 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1700,7 +1700,7 @@ void _glfwPlatformRefreshWindowParams(void)
                                &dotclock, &modeline);
         pixels_per_second = 1000.0f * (float) dotclock;
         pixels_per_frame  = (float) modeline.htotal * modeline.vtotal;
-        window->refreshRate = (int)(pixels_per_second/pixels_per_frame+0.5);
+        window->refreshRate = (int) (pixels_per_second / pixels_per_frame + 0.5);
 #endif /*_GLFW_HAS_XF86VIDMODE*/
     }
     else