diff --git a/src/lib/platform/OSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp
index a3ffbbd1..b384f853 100644
--- a/src/lib/platform/OSXClipboard.cpp
+++ b/src/lib/platform/OSXClipboard.cpp
@@ -100,13 +100,13 @@ OSXClipboard::add(EFormat format, const String & data)
 		return;
 
 	LOG((CLOG_DEBUG "add %d bytes to clipboard format: %d", data.size(), format));
-	if(format == IClipboard::kText) {
+	if (format == IClipboard::kText) {
 		LOG((CLOG_DEBUG " format of data to be added to clipboard was kText"));
 	}
-	else if(format == IClipboard::kBitmap) {
+	else if (format == IClipboard::kBitmap) {
 		LOG((CLOG_DEBUG " format of data to be added to clipboard was kBitmap"));
 	}
-	else if(format == IClipboard::kHTML) {
+	else if (format == IClipboard::kHTML) {
 		LOG((CLOG_DEBUG " format of data to be added to clipboard was kHTML"));
 	}
 
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index 640daf61..06cc0fda 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -332,10 +332,10 @@ OSXKeyState::mapKeyFromEvent(KeyIDs& ids,
 
 	// choose action
 	UInt16 action;
-	if(eventKind==kCGEventKeyDown) {
+	if (eventKind==kCGEventKeyDown) {
 		action = kUCKeyActionDown;
 	}
-	else if(CGEventGetIntegerValueField(event, kCGKeyboardEventAutorepeat)==1) {
+	else if (CGEventGetIntegerValueField(event, kCGKeyboardEventAutorepeat)==1) {
 		action = kUCKeyActionAutoKey;
 	}
 	else {
diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp
index 0dde87e0..bdd0a483 100644
--- a/src/lib/platform/OSXScreen.cpp
+++ b/src/lib/platform/OSXScreen.cpp
@@ -572,8 +572,8 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
     // increase clickState (double click, triple click, etc)
     // This will allow for higher than triple click but the quartz documenation
     // does not specify that this should be limited to triple click
-    if(press) {
-        if((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){
+    if (press) {
+        if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){
             m_clickState++;
         }
         else {
@@ -583,7 +583,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
         m_lastClickTime = ARCH->time();
     }
     
-    if(m_clickState == 1){
+    if (m_clickState == 1){
         m_lastSingleClickXCursor = m_xCursor;
         m_lastSingleClickYCursor = m_yCursor;
     }
@@ -942,7 +942,7 @@ OSXScreen::leave()
 bool
 OSXScreen::setClipboard(ClipboardID, const IClipboard* src)
 {
-	if(src != NULL) {
+	if (src != NULL) {
 		LOG((CLOG_DEBUG "setting clipboard"));
 		Clipboard::copy(&m_pasteboard, src);	
 	}	
@@ -2017,7 +2017,7 @@ OSXScreen::handleCGInputEvent(CGEventTapProxy proxy,
 			LOG((CLOG_WARN "unknown quartz event type: 0x%02x", type));
 	}
 	
-	if(screen->m_isOnScreen) {
+	if (screen->m_isOnScreen) {
 		return event;
 	} else {
 		return NULL;
@@ -2143,7 +2143,7 @@ OSXScreen::waitForCarbonLoop() const
 
 	double timeout = ARCH->time() + kCarbonLoopWaitTimeout;
 	while (!m_carbonLoopReady->wait()) {
-		if(ARCH->time() > timeout) {
+		if (ARCH->time() > timeout) {
 			LOG((CLOG_DEBUG "carbon loop not ready, waiting again"));
 			timeout = ARCH->time() + kCarbonLoopWaitTimeout;
 		}