diff --git a/src/kits/tracker/MiniMenuField.cpp b/src/kits/tracker/MiniMenuField.cpp
index 782191849f..3de73fd980 100644
--- a/src/kits/tracker/MiniMenuField.cpp
+++ b/src/kits/tracker/MiniMenuField.cpp
@@ -44,8 +44,9 @@ All rights reserved.
 
 MiniMenuField::MiniMenuField(BRect frame, const char* name, BPopUpMenu* menu,
 	uint32 resizeFlags, uint32 flags)
-	:	BView(frame, name, resizeFlags, flags),
-		fMenu(menu)
+	:
+	BView(frame, name, resizeFlags, flags),
+	fMenu(menu)
 {
 	SetFont(be_plain_font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE);
 }
@@ -60,10 +61,11 @@ MiniMenuField::~MiniMenuField()
 void
 MiniMenuField::AttachedToWindow()
 {
-	if (Parent()) {
+	if (Parent() != NULL) {
 		SetViewColor(Parent()->ViewColor());
 		SetLowColor(Parent()->ViewColor());
 	}
+
 	SetHighColor(0, 0, 0);
 }
 
@@ -150,4 +152,3 @@ MiniMenuField::MouseDown(BPoint)
 {
 	fMenu->Go(ConvertToScreen(BPoint(4, 4)), true);
 }
-
diff --git a/src/kits/tracker/MiniMenuField.h b/src/kits/tracker/MiniMenuField.h
index d9689b76c5..33119ee4fa 100644
--- a/src/kits/tracker/MiniMenuField.h
+++ b/src/kits/tracker/MiniMenuField.h
@@ -31,8 +31,8 @@ of Be Incorporated in the United States and other countries. Other brand product
 names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
-#ifndef __MINI_MENU_FIELD__
-#define __MINI_MENU_FIELD__
+#ifndef _MINI_MENU_FIELD_H
+#define _MINI_MENU_FIELD_H
 
 
 #include <View.h>
@@ -40,6 +40,7 @@ All rights reserved.
 
 class BPopUpMenu;
 
+
 namespace BPrivate {
 
 class MiniMenuField : public BView {
@@ -67,4 +68,5 @@ private:
 
 using namespace BPrivate;
 
-#endif	// __MINI_MENU_FIELD__
+
+#endif	// _MINI_MENU_FIELD_H