diff --git a/headers/private/kernel/boot/menu.h b/headers/private/kernel/boot/menu.h
index 49e7b37253..ae289ca0e8 100644
--- a/headers/private/kernel/boot/menu.h
+++ b/headers/private/kernel/boot/menu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2010, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 #ifndef KERNEL_BOOT_MENU_H
@@ -15,6 +15,7 @@ class MenuItem;
 
 typedef bool (*menu_item_hook)(Menu *, MenuItem *);
 
+
 enum menu_item_type {
 	MENU_ITEM_STANDARD = 1,
 	MENU_ITEM_MARKABLE,
@@ -23,53 +24,59 @@ enum menu_item_type {
 	MENU_ITEM_SEPARATOR,
 };
 
+
 class MenuItem : public DoublyLinkedListLinkImpl<MenuItem> {
-	public:
-		MenuItem(const char *label = NULL, Menu *subMenu = NULL);
-		~MenuItem();
+public:
+								MenuItem(const char* label = NULL,
+									Menu* subMenu = NULL);
+								~MenuItem();
 
-		void SetTarget(menu_item_hook target);
-		menu_item_hook Target() const { return fTarget; }
+			void				SetTarget(menu_item_hook target);
+			menu_item_hook		Target() const { return fTarget; }
 
-		void SetMarked(bool marked);
-		bool IsMarked() const { return fIsMarked; }
+			void				SetMarked(bool marked);
+			bool				IsMarked() const { return fIsMarked; }
 
-		void Select(bool selected);
-		bool IsSelected() const { return fIsSelected; }
+			void				Select(bool selected);
+			bool				IsSelected() const { return fIsSelected; }
 
-		void SetEnabled(bool enabled);
-		bool IsEnabled() const { return fIsEnabled; }
+			void				SetEnabled(bool enabled);
+			bool				IsEnabled() const { return fIsEnabled; }
 
-		void SetType(menu_item_type type);
-		menu_item_type Type() const { return fType; }
+			void				SetType(menu_item_type type);
+			menu_item_type		Type() const { return fType; }
 
-		void SetData(const void *data);
-		const void *Data() const { return fData; }
+			void				SetData(const void* data);
+			const void*			Data() const { return fData; }
 
-		void SetHelpText(const char *text);
-		const char *HelpText() const { return fHelpText; }
+			void				SetHelpText(const char* text);
+			const char*			HelpText() const { return fHelpText; }
 
-		const char *Label() const { return fLabel; }
-		Menu *Submenu() const { return fSubMenu; }
+			const char*			Label() const { return fLabel; }
+			Menu*				Submenu() const { return fSubMenu; }
 
-	private:
-		friend class Menu;
-		void SetMenu(Menu *menu);
+private:
+			friend class Menu;
+			void				SetMenu(Menu* menu);
 
-		const char		*fLabel;
-		menu_item_hook	fTarget;
-		bool			fIsMarked;
-		bool			fIsSelected;
-		bool			fIsEnabled;
-		menu_item_type	fType;
-		Menu			*fMenu, *fSubMenu;
-		const void		*fData;
-		const char		*fHelpText;
+private:
+			const char*			fLabel;
+			menu_item_hook		fTarget;
+			bool				fIsMarked;
+			bool				fIsSelected;
+			bool				fIsEnabled;
+			menu_item_type		fType;
+			Menu*				fMenu;
+			Menu*				fSubMenu;
+			const void*			fData;
+			const char*			fHelpText;
 };
 
+
 typedef DoublyLinkedList<MenuItem> MenuItemList;
 typedef MenuItemList::Iterator MenuItemIterator;
 
+
 enum menu_type {
 	MAIN_MENU = 1,
 	SAFE_MODE_MENU,
@@ -77,53 +84,59 @@ enum menu_type {
 	CHOICE_MENU,
 };
 
+
 class Menu {
-	public:
-		Menu(menu_type type, const char *title = NULL);
-		~Menu();
+public:
+								Menu(menu_type type, const char* title = NULL);
+								~Menu();
 
-		menu_type Type() const { return fType; }
+			menu_type			Type() const { return fType; }
 
-		void Hide() { fIsHidden = true; }
-		void Show() { fIsHidden = false; }
-		bool IsHidden() const { return fIsHidden; }
+			void				Hide() { fIsHidden = true; }
+			void				Show() { fIsHidden = false; }
+			bool				IsHidden() const { return fIsHidden; }
 
-		MenuItemIterator ItemIterator() { return fItems.GetIterator(); }
-		MenuItem *ItemAt(int32 index);
-		int32 IndexOf(MenuItem *item);
-		int32 CountItems() const;
+			MenuItemIterator	ItemIterator() { return fItems.GetIterator(); }
+			MenuItem*			ItemAt(int32 index);
+			int32				IndexOf(MenuItem* item);
+			int32				CountItems() const;
 
-		MenuItem *FindItem(const char *label);
-		MenuItem *FindMarked();
-		MenuItem *FindSelected(int32 *_index = NULL);
+			MenuItem*			FindItem(const char* label);
+			MenuItem*			FindMarked();
+			MenuItem*			FindSelected(int32* _index = NULL);
 
-		void AddItem(MenuItem *item);
-		status_t AddSeparatorItem();
+			void				AddItem(MenuItem* item);
+			status_t			AddSeparatorItem();
 
-		MenuItem *RemoveItemAt(int32 index);
-		void RemoveItem(MenuItem *item);
+			MenuItem*			RemoveItemAt(int32 index);
+			void				RemoveItem(MenuItem* item);
 
-		MenuItem *Superitem() const { return fSuperItem; }
-		Menu *Supermenu() const { return fSuperItem ? fSuperItem->fMenu : NULL; }
+			MenuItem*			Superitem() const { return fSuperItem; }
+			Menu*				Supermenu() const
+									{ return fSuperItem
+										? fSuperItem->fMenu : NULL; }
 
-		const char *Title() const { return fTitle; }
+			const char*			Title() const { return fTitle; }
 
-		void SetChoiceText(const char *text) { fChoiceText = text; }
-		const char *ChoiceText() const { return fChoiceText; }
+			void				SetChoiceText(const char* text)
+									{ fChoiceText = text; }
+			const char*			ChoiceText() const { return fChoiceText; }
 
-		void Run();
+			void Run();
 
-	private:
-		friend class MenuItem;
-		void Draw(MenuItem *item);
+private:
+			friend class MenuItem;
+			void				Draw(MenuItem* item);
 
-		const char		*fTitle;
-		const char		*fChoiceText;
-		int32			fCount;
-		bool			fIsHidden;
-		MenuItemList	fItems;
-		menu_type		fType;
-		MenuItem		*fSuperItem;
+private:
+			const char*			fTitle;
+			const char*			fChoiceText;
+			int32				fCount;
+			bool				fIsHidden;
+			MenuItemList		fItems;
+			menu_type			fType;
+			MenuItem*			fSuperItem;
 };
 
+
 #endif	/* KERNEL_BOOT_MENU_H */