diff --git a/src/kits/app/TokenSpace.cpp b/src/kits/app/TokenSpace.cpp
index ed8f1048df..e997147a4b 100644
--- a/src/kits/app/TokenSpace.cpp
+++ b/src/kits/app/TokenSpace.cpp
@@ -1,131 +1,111 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2001-2002, OpenBeOS
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		TokenSpace.cpp
-//	Author(s):		Erik Jaesler <erik@cgsoftware.com>
-//	Description:	Class for creating tokens
-//------------------------------------------------------------------------------
+/*
+ * Copyright 2001-2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Erik Jaesler (erik@cgsoftware.com)
+ */
+
 
-// Standard Includes -----------------------------------------------------------
 #include <map>
 #include <stack>
 
-// System Includes -------------------------------------------------------------
 #include <Autolock.h>
 
-// Project Includes ------------------------------------------------------------
-
-// Local Includes --------------------------------------------------------------
 #include "TokenSpace.h"
 
-// Local Defines ---------------------------------------------------------------
-
-// Globals ---------------------------------------------------------------------
 
 namespace BPrivate {
 
 BTokenSpace gDefaultTokens;
+	// the one and only token space object per team
 
 
-//------------------------------------------------------------------------------
 BTokenSpace::BTokenSpace()
 {
 }
-//------------------------------------------------------------------------------
+
+
 BTokenSpace::~BTokenSpace()
 {
 }
-//------------------------------------------------------------------------------
-int32 BTokenSpace::NewToken(int16 type, void* object,
-							new_token_callback callback)
+
+
+int32
+BTokenSpace::NewToken(int16 type, void* object,
+	new_token_callback callback)
 {
 	BAutolock Lock(fLocker);
-	TTokenInfo ti = { type, object };
+
+	TTokenInfo tokenInfo = { type, object };
 	int32 token;
-	if (fTokenBin.empty())
-	{
+
+	if (fTokenBin.empty()) {
 		token = fTokenCount;
 		++fTokenCount;
-	}
-	else
-	{
+	} else {
 		token = fTokenBin.top();
 		fTokenBin.pop();
 	}
 
-	fTokenMap[token] = ti;
+	fTokenMap[token] = tokenInfo;
 
 	if (callback)
-	{
 		callback(type, object);
-	}
 
 	return token;
 }
-//------------------------------------------------------------------------------
-bool BTokenSpace::RemoveToken(int32 token, remove_token_callback callback)
+
+
+bool
+BTokenSpace::RemoveToken(int32 token, remove_token_callback callback)
 {
 	BAutolock Lock(fLocker);
+
 	TTokenMap::iterator iter = fTokenMap.find(token);
 	if (iter == fTokenMap.end())
-	{
 		return false;
-	}
 
 	if (callback)
-	{
 		callback(iter->second.type, iter->second.object);
-	}
 
 	fTokenMap.erase(iter);
 	fTokenBin.push(token);
 
 	return true;
 }
-//------------------------------------------------------------------------------
-bool BTokenSpace::CheckToken(int32 token, int16 type) const
+
+
+/**	Checks wether or not the \a token exists with the specified
+ *	\a type in the token space or not.
+ */
+
+bool
+BTokenSpace::CheckToken(int32 token, int16 type) const
 {
 	BAutolock Locker(const_cast<BLocker&>(fLocker));
+
 	TTokenMap::const_iterator iter = fTokenMap.find(token);
 	if (iter != fTokenMap.end() && iter->second.type == type)
-	{
 		return true;
-	}
 
 	return false;
 }
-//------------------------------------------------------------------------------
-status_t BTokenSpace::GetToken(int32 token, int16 type, void** object,
-							   get_token_callback callback) const
+
+
+status_t
+BTokenSpace::GetToken(int32 token, int16 type, void** object,
+	get_token_callback callback) const
 {
 	BAutolock Locker(const_cast<BLocker&>(fLocker));
+
 	TTokenMap::const_iterator iter = fTokenMap.find(token);
-	if (iter == fTokenMap.end())
-	{
+	if (iter == fTokenMap.end()) {
 		*object = NULL;
 		return B_ERROR;
 	}
 
-	if (callback && !callback(iter->second.type, iter->second.object))
-	{
+	if (callback && !callback(iter->second.type, iter->second.object)) {
 		*object = NULL;
 		return B_ERROR;
 	}
@@ -134,14 +114,6 @@ status_t BTokenSpace::GetToken(int32 token, int16 type, void** object,
 
 	return B_OK;
 }
-//------------------------------------------------------------------------------
 
 }	// namespace BPrivate
 
-/*
- * $Log $
- *
- * $Id  $
- *
- */
-