diff --git a/src/preferences/screen/AlertView.cpp b/src/preferences/screen/AlertView.cpp
index 1105abeca1..a6567d4b8f 100644
--- a/src/preferences/screen/AlertView.cpp
+++ b/src/preferences/screen/AlertView.cpp
@@ -168,4 +168,3 @@ AlertView::InitIcon()
 
 	return icon;
 }
-
diff --git a/src/preferences/screen/ScreenApplication.cpp b/src/preferences/screen/ScreenApplication.cpp
index 3461a77ee9..f02238009c 100644
--- a/src/preferences/screen/ScreenApplication.cpp
+++ b/src/preferences/screen/ScreenApplication.cpp
@@ -51,11 +51,11 @@ ScreenApplication::MessageReceived(BMessage* message)
 	switch (message->what) {
 		case SET_CUSTOM_REFRESH_MSG:
 		case MAKE_INITIAL_MSG:
-			fScreenWindow->PostMessage(message);	
+			fScreenWindow->PostMessage(message);
 			break;
 
 		default:
-			BApplication::MessageReceived(message);			
+			BApplication::MessageReceived(message);
 			break;
 	}
 }
diff --git a/src/preferences/screen/ScreenMode.cpp b/src/preferences/screen/ScreenMode.cpp
index a4177ecdb0..545b63175b 100644
--- a/src/preferences/screen/ScreenMode.cpp
+++ b/src/preferences/screen/ScreenMode.cpp
@@ -677,4 +677,3 @@ ScreenMode::_GetDisplayMode(const screen_mode& mode, display_mode& displayMode)
 
 	return true;
 }
-
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 4acde46450..43febab7b9 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -713,11 +713,11 @@ ScreenWindow::_UpdateControls()
 	_UpdateWorkspaceButtons();
 
 	BMenuItem* item = fSwapDisplaysMenu->ItemAt((int32)fSelected.swap_displays);
-	if (item && !item->IsMarked())
+	if (item != NULL && !item->IsMarked())
 		item->SetMarked(true);
 
 	item = fUseLaptopPanelMenu->ItemAt((int32)fSelected.use_laptop_panel);
-	if (item && !item->IsMarked())
+	if (item != NULL && !item->IsMarked())
 		item->SetMarked(true);
 
 	for (int32 i = 0; i < fTVStandardMenu->CountItems(); i++) {
@@ -768,7 +768,7 @@ ScreenWindow::_UpdateControls()
 	for (int32 i = 0; i < kCombineModeCount; i++) {
 		if (kCombineModes[i].mode == fSelected.combine) {
 			item = fCombineMenu->ItemAt(i);
-			if (item && !item->IsMarked())
+			if (item != NULL && !item->IsMarked())
 				item->SetMarked(true);
 			break;
 		}
@@ -788,7 +788,7 @@ ScreenWindow::_UpdateControls()
 		index++;
 	}
 
-	if (item && !item->IsMarked())
+	if (item != NULL && !item->IsMarked())
 		item->SetMarked(true);
 
 	_UpdateColorLabel();
@@ -1320,4 +1320,3 @@ ScreenWindow::_Apply()
 		alert->Go();
 	}
 }
-