diff --git a/contracts/token/BasicToken.sol b/contracts/token/BasicToken.sol
index 704de675d..b0ad1e480 100644
--- a/contracts/token/BasicToken.sol
+++ b/contracts/token/BasicToken.sol
@@ -1,9 +1,11 @@
 pragma solidity ^0.4.4;
 
+
 import './ERC20Basic.sol';
 import '../SafeMath.sol';
 
-/**
+
+/*
  * Basic token
  * Basic version of StandardToken, with no allowances
  */
diff --git a/contracts/token/CrowdsaleToken.sol b/contracts/token/CrowdsaleToken.sol
index ba3100cbc..f78654698 100644
--- a/contracts/token/CrowdsaleToken.sol
+++ b/contracts/token/CrowdsaleToken.sol
@@ -1,8 +1,12 @@
 pragma solidity ^0.4.4;
 
+
 import "./StandardToken.sol";
 
+
 /*
+ * CrowdsaleToken
+ *
  * Simple ERC20 Token example, with crowdsale token creation
  */
 contract CrowdsaleToken is StandardToken {
diff --git a/contracts/token/ERC20.sol b/contracts/token/ERC20.sol
index 9d32c69fd..4ac0bb1fb 100644
--- a/contracts/token/ERC20.sol
+++ b/contracts/token/ERC20.sol
@@ -1,8 +1,10 @@
 pragma solidity ^0.4.4;
 
 
-// see https://github.com/ethereum/EIPs/issues/20
-
+/*
+ * ERC20 interface
+ * see https://github.com/ethereum/EIPs/issues/20
+ */
 contract ERC20 {
   uint public totalSupply;
   function balanceOf(address who) constant returns (uint);
diff --git a/contracts/token/ERC20Basic.sol b/contracts/token/ERC20Basic.sol
index 4f7ca36d1..b42d457cc 100644
--- a/contracts/token/ERC20Basic.sol
+++ b/contracts/token/ERC20Basic.sol
@@ -1,6 +1,11 @@
 pragma solidity ^0.4.4;
 
 
+/*
+ * ERC20Basic
+ * Simpler version of ERC20 interface
+ * see https://github.com/ethereum/EIPs/issues/20
+ */
 contract ERC20Basic {
   uint public totalSupply;
   function balanceOf(address who) constant returns (uint);
diff --git a/contracts/token/SimpleToken.sol b/contracts/token/SimpleToken.sol
index fc7efd0d6..8b59438ae 100644
--- a/contracts/token/SimpleToken.sol
+++ b/contracts/token/SimpleToken.sol
@@ -1,8 +1,12 @@
 pragma solidity ^0.4.4;
 
+
 import "./StandardToken.sol";
 
+
 /*
+ * SimpleToken
+ *
  * Very simple ERC20 Token example, where all tokens are pre-assigned
  * to the creator. Note they can later distribute these tokens
  * as they wish using `transfer` and other `StandardToken` functions.