diff --git a/headers/os/storage/Node.h b/headers/os/storage/Node.h
index bb22e74fac..f91a375264 100644
--- a/headers/os/storage/Node.h
+++ b/headers/os/storage/Node.h
@@ -1,10 +1,11 @@
 /*
- * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2011, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _NODE_H
 #define _NODE_H
 
+
 #include <Statable.h>
 
 
@@ -16,11 +17,11 @@ struct entry_ref;
 
 struct node_ref {
 	node_ref();
-	node_ref(const node_ref &ref);
+	node_ref(const node_ref& ref);
 
-	bool operator==(const node_ref &ref) const;
-	bool operator!=(const node_ref &ref) const;
-	node_ref& operator=(const node_ref &ref);
+	bool operator==(const node_ref& ref) const;
+	bool operator!=(const node_ref& ref) const;
+	node_ref& operator=(const node_ref& ref);
 
 	dev_t device;
 	ino_t node;
@@ -29,79 +30,86 @@ struct node_ref {
 
 class BNode : public BStatable {
 public:
-	BNode();
-	BNode(const entry_ref *ref);
-	BNode(const BEntry *entry);
-	BNode(const char *path);
-	BNode(const BDirectory *dir, const char *path);
-	BNode(const BNode &node);
-	virtual ~BNode();
+								BNode();
+								BNode(const entry_ref* ref);
+								BNode(const BEntry* entry);
+								BNode(const char* path);
+								BNode(const BDirectory* dir, const char* path);
+								BNode(const BNode& node);
+	virtual						~BNode();
 
-	status_t InitCheck() const;
+			status_t			InitCheck() const;
 
-	virtual status_t GetStat(struct stat *st) const;
+	virtual	status_t			GetStat(struct stat* st) const;
 
-	status_t SetTo(const entry_ref *ref);
-	status_t SetTo(const BEntry *entry);
-	status_t SetTo(const char *path);
-	status_t SetTo(const BDirectory *dir, const char *path);
-	void Unset();
+			status_t			SetTo(const entry_ref* ref);
+			status_t			SetTo(const BEntry* entry);
+			status_t			SetTo(const char* path);
+			status_t			SetTo(const BDirectory* dir, const char* path);
+			void				Unset();
 
-	status_t Lock();
-	status_t Unlock();
+			status_t			Lock();
+			status_t			Unlock();
 
-	status_t Sync();
+			status_t			Sync();
 
-	ssize_t WriteAttr(const char *name, type_code type, off_t offset,
-		const void *buffer, size_t len);
-	ssize_t ReadAttr(const char *name, type_code type, off_t offset,
-		void *buffer, size_t len) const;
-	status_t RemoveAttr(const char *name);
-	status_t RenameAttr(const char *oldname, const char *newname);
-	status_t GetAttrInfo(const char *name, struct attr_info *info) const;
-	status_t GetNextAttrName(char *buffer);
-	status_t RewindAttrs();
-	status_t WriteAttrString(const char *name, const BString *data);
-	status_t ReadAttrString(const char *name, BString *result) const;
+			ssize_t				WriteAttr(const char* name, type_code type,
+									off_t offset, const void* buffer,
+									size_t length);
+			ssize_t				ReadAttr(const char* name, type_code type,
+									off_t offset, void* buffer,
+									size_t length) const;
+			status_t			RemoveAttr(const char* name);
+			status_t			RenameAttr(const char* oldName,
+									const char* newName);
+			status_t			GetAttrInfo(const char* name,
+									struct attr_info* info) const;
+			status_t			GetNextAttrName(char* buffer);
+			status_t			RewindAttrs();
+			status_t			WriteAttrString(const char* name,
+									const BString* data);
+			status_t			ReadAttrString(const char* name,
+									BString* result) const;
 
-	BNode& operator=(const BNode &node);
-	bool operator==(const BNode &node) const;
-	bool operator!=(const BNode &node) const;
+			BNode&				operator=(const BNode& node);
+			bool				operator==(const BNode& node) const;
+			bool				operator!=(const BNode& node) const;
 
-	int Dup();  // This should be "const" but R5's is not... Ugggh.
+			int					Dup();
+				// This should be "const" but R5's is not... Ugggh.
 
 private:
 	friend class BFile;
 	friend class BDirectory;
 	friend class BSymLink;
 
-	virtual void _RudeNode1();
-	virtual void _RudeNode2();
-	virtual void _RudeNode3();
-	virtual void _RudeNode4();
-	virtual void _RudeNode5();
-	virtual void _RudeNode6();
+	virtual	void				_RudeNode1();
+	virtual	void				_RudeNode2();
+	virtual	void				_RudeNode3();
+	virtual	void				_RudeNode4();
+	virtual	void				_RudeNode5();
+	virtual	void				_RudeNode6();
 
 private:
-	status_t set_fd(int fd);
-	virtual void close_fd();
-	void set_status(status_t newStatus);
+			status_t			set_fd(int fd);
+	virtual	void				close_fd();
+			void				set_status(status_t newStatus);
 
-	status_t _SetTo(int fd, const char *path, bool traverse);
-	status_t _SetTo(const entry_ref *ref, bool traverse);
+			status_t			_SetTo(int fd, const char* path, bool traverse);
+			status_t			_SetTo(const entry_ref* ref, bool traverse);
 
-	virtual status_t set_stat(struct stat &st, uint32 what);
+	virtual	status_t			set_stat(struct stat& st, uint32 what);
 
-	status_t _GetStat(struct stat *st) const;
-	virtual status_t _GetStat(struct stat_beos *st) const;
+			status_t			_GetStat(struct stat* st) const;
+	virtual	status_t			_GetStat(struct stat_beos* st) const;
+			status_t			InitAttrDir();
 
 private:
-	uint32 rudeData[4];
-	int fFd;
-	int fAttrFd;
-	status_t fCStatus;
-
-	status_t InitAttrDir();
+			uint32				rudeData[4];
+			int					fFd;
+			int					fAttrFd;
+			status_t			fCStatus;
 };
 
+
 #endif	// _NODE_H