refactor

contracts/Bounty.sol

@@ -18,7 +18,7 @@ contract Bounty is PullPayment, Destructible {
   /**
    * @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
    */
-  function() payable {
+  function() public payable {
     require(!claimed);
   }
 

contracts/DayLimit.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.4.11;
 
+
 /**
  * @title DayLimit
  * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable)
@@ -15,7 +16,7 @@ contract DayLimit {
    * @dev Constructor that sets the passed value as a dailyLimit.
    * @param _limit uint256 to represent the daily limit.
    */
-  function DayLimit(uint256 _limit) {
+  function DayLimit(uint256 _limit) internal {
     dailyLimit = _limit;
     lastDay = today();
   }

contracts/LimitBalance.sol

@@ -15,7 +15,7 @@ contract LimitBalance {
    * @dev Constructor that sets the passed value as a limit.
    * @param _limit uint256 to represent the limit.
    */
-  function LimitBalance(uint256 _limit) {
+  function LimitBalance(uint256 _limit) internal {
     limit = _limit;
   }
 

contracts/MerkleProof.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.4.11;
 
+
 /*
  * @title MerkleProof
  * @dev Merkle proof verification
@@ -13,9 +14,19 @@ library MerkleProof {
    * @param _root Merkle root
    * @param _leaf Leaf of Merkle tree
    */
-  function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) constant returns (bool) {
+
+  function verifyProof(
+    bytes _proof,
+    bytes32 _root,
+    bytes32 _leaf
+  )
+    public
+    constant
+    returns (bool)
+  {
     // Check if proof length is a multiple of 32
-    if (_proof.length % 32 != 0) return false;
+    if (_proof.length % 32 != 0)
+      return false;
 
     bytes32 proofElement;
     bytes32 computedHash = _leaf;

contracts/ReentrancyGuard.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.4.11;
 
+
 /**
  * @title Helps contracts guard agains rentrancy attacks.
  * @author Remco Bloemen <remco@2π.com>

contracts/crowdsale/CappedCrowdsale.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.11;
 import '../math/SafeMath.sol';
 import './Crowdsale.sol';
 
+
 /**
  * @title CappedCrowdsale
  * @dev Extension of Crowdsale with a max amount of funds raised
@@ -12,7 +13,7 @@ contract CappedCrowdsale is Crowdsale {
 
   uint256 public cap;
 
-  function CappedCrowdsale(uint256 _cap) {
+  function CappedCrowdsale(uint256 _cap) internal {
     require(_cap > 0);
     cap = _cap;
   }

contracts/crowdsale/Crowdsale.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.11;
 import '../token/MintableToken.sol';
 import '../math/SafeMath.sol';
 
+
 /**
  * @title Crowdsale
  * @dev Crowdsale is a base contract for managing a token crowdsale.
@@ -37,10 +38,21 @@ contract Crowdsale {
    * @param value weis paid for purchase
    * @param amount amount of tokens purchased
    */
-  event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
-
-
-  function Crowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet) {
+  event TokenPurchase(
+    address indexed purchaser,
+    address indexed beneficiary,
+    uint256 value,
+    uint256 amount
+  );
+
+  function Crowdsale(
+    uint256 _startTime,
+    uint256 _endTime,
+    uint256 _rate,
+    address _wallet
+  )
+    internal
+  {
     require(_startTime >= now);
     require(_endTime >= _startTime);
     require(_rate > 0);
@@ -59,9 +71,8 @@ contract Crowdsale {
     return new MintableToken();
   }
 
-
   // fallback function can be used to buy tokens
-  function () payable {
+  function () public payable {
     buyTokens(msg.sender);
   }
 

contracts/crowdsale/FinalizableCrowdsale.sol

@@ -4,6 +4,7 @@ import '../math/SafeMath.sol';
 import '../ownership/Ownable.sol';
 import './Crowdsale.sol';
 
+
 /**
  * @title FinalizableCrowdsale
  * @dev Extension of Crowdsale where an owner can do extra work

contracts/crowdsale/RefundVault.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.11;
 import '../math/SafeMath.sol';
 import '../ownership/Ownable.sol';
 
+
 /**
  * @title RefundVault
  * @dev This contract is used for storing funds while a crowdsale
@@ -22,7 +23,7 @@ contract RefundVault is Ownable {
   event RefundsEnabled();
   event Refunded(address indexed beneficiary, uint256 weiAmount);
 
-  function RefundVault(address _wallet) {
+  function RefundVault(address _wallet) public {
     require(_wallet != 0x0);
     wallet = _wallet;
     state = State.Active;

contracts/crowdsale/RefundableCrowdsale.sol

@@ -21,7 +21,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
   // refund vault used to hold funds while crowdsale is running
   RefundVault public vault;
 
-  function RefundableCrowdsale(uint256 _goal) {
+  function RefundableCrowdsale(uint256 _goal) public {
     require(_goal > 0);
     vault = new RefundVault(wallet);
     goal = _goal;

contracts/examples/SampleCrowdsale.sol

@@ -4,19 +4,21 @@ import "../crowdsale/CappedCrowdsale.sol";
 import "../crowdsale/RefundableCrowdsale.sol";
 import "../token/MintableToken.sol";
 
+
 /**
  * @title SampleCrowdsaleToken
  * @dev Very simple ERC20 Token that can be minted.
  * It is meant to be used in a crowdsale contract.
  */
 contract SampleCrowdsaleToken is MintableToken {
 
-  string public constant name = "Sample Crowdsale Token";
-  string public constant symbol = "SCT";
-  uint8 public constant decimals = 18;
+  string public constant NAME = "Sample Crowdsale Token";
+  string public constant SYMBOL = "SCT";
+  uint8 public constant DECIMALS = 18;
 
 }
 
+
 /**
  * @title SampleCrowdsale
  * @dev This is an example of a fully fledged crowdsale.
@@ -30,7 +32,15 @@ contract SampleCrowdsaleToken is MintableToken {
  */
 contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
 
-  function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet)
+  function SampleCrowdsale(
+    uint256 _startTime,
+    uint256 _endTime,
+    uint256 _rate,
+    uint256 _goal,
+    uint256 _cap,
+    address _wallet
+  )
+    public
     CappedCrowdsale(_cap)
     FinalizableCrowdsale()
     RefundableCrowdsale(_goal)

contracts/examples/SimpleToken.sol

@@ -12,16 +12,16 @@ import "../token/StandardToken.sol";
  */
 contract SimpleToken is StandardToken {
 
-  string public constant name = "SimpleToken";
-  string public constant symbol = "SIM";
-  uint8 public constant decimals = 18;
+  string public constant NAME = "SimpleToken";
+  string public constant SYMBOL = "SIM";
+  uint8 public constant DECIMALS = 18;
 
-  uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals));
+  uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(DECIMALS));
 
   /**
    * @dev Constructor that gives msg.sender all of existing tokens.
    */
-  function SimpleToken() {
+  function SimpleToken() public {
     totalSupply = INITIAL_SUPPLY;
     balances[msg.sender] = INITIAL_SUPPLY;
   }

contracts/lifecycle/Destructible.sol

@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
  */
 contract Destructible is Ownable {
 
-  function Destructible() payable { }
+  function Destructible() internal payable { }
 
   /**
    * @dev Transfers the current balance to the owner and terminates the contract.

contracts/lifecycle/Migrations.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.4.11;
 
 import '../ownership/Ownable.sol';
 
+
 /**
  * @title Migrations
  * @dev This is a truffle contract, needed for truffle integration, not meant for use by Zeppelin users.

contracts/lifecycle/TokenDestructible.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.4.11;
 import "../ownership/Ownable.sol";
 import "../token/ERC20Basic.sol";
 
+
 /**
  * @title TokenDestructible:
  * @author Remco Bloemen <remco@2π.com>
@@ -12,7 +13,7 @@ import "../token/ERC20Basic.sol";
  */
 contract TokenDestructible is Ownable {
 
-  function TokenDestructible() payable { }
+  function TokenDestructible() internal payable { }
 
   /**
    * @notice Terminate contract and refund to owner
@@ -24,7 +25,7 @@ contract TokenDestructible is Ownable {
   function destroy(address[] tokens) onlyOwner public {
 
     // Transfer tokens to owner
-    for(uint256 i = 0; i < tokens.length; i++) {
+    for (uint256 i = 0; i < tokens.length; i++) {
       ERC20Basic token = ERC20Basic(tokens[i]);
       uint256 balance = token.balanceOf(this);
       token.transfer(owner, balance);

contracts/math/Math.sol

@@ -1,10 +1,10 @@
 pragma solidity ^0.4.11;
 
+
 /**
  * @title Math
  * @dev Assorted math operations
  */
-
 library Math {
   function max64(uint64 a, uint64 b) internal constant returns (uint64) {
     return a >= b ? a : b;

contracts/ownership/CanReclaimToken.sol

@@ -4,6 +4,7 @@ import "./Ownable.sol";
 import "../token/ERC20Basic.sol";
 import "../token/SafeERC20.sol";
 
+
 /**
  * @title Contracts that should be able to recover tokens
  * @author SylTi

contracts/ownership/Contactable.sol

@@ -2,20 +2,21 @@ pragma solidity ^0.4.11;
 
 import './Ownable.sol';
 
+
 /**
  * @title Contactable token
  * @dev Basic version of a contactable contract, allowing the owner to provide a string with their
  * contact information.
  */
-contract Contactable is Ownable{
+contract Contactable is Ownable {
 
-    string public contactInformation;
+  string public contactInformation;
 
-    /**
-     * @dev Allows the owner to set a string with their contact information.
-     * @param info The contact information to attach to the contract.
-     */
-    function setContactInformation(string info) onlyOwner public {
-         contactInformation = info;
-     }
+  /**
+   * @dev Allows the owner to set a string with their contact information.
+   * @param info The contact information to attach to the contract.
+   */
+  function setContactInformation(string info) onlyOwner public {
+    contactInformation = info;
+  }
 }

contracts/ownership/DelayedClaimable.sol

@@ -26,7 +26,6 @@ contract DelayedClaimable is Claimable {
     start = _start;
   }
 
-
   /**
    * @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within
    * the specified start and end time.

contracts/ownership/HasNoContracts.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.11;
 
 import "./Ownable.sol";
 
+
 /**
  * @title Contracts that should not own Contracts
  * @author Remco Bloemen <remco@2π.com>

contracts/ownership/HasNoEther.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.11;
 
 import "./Ownable.sol";
 
+
 /**
  * @title Contracts that should not own Ether
  * @author Remco Bloemen <remco@2π.com>
@@ -21,7 +22,7 @@ contract HasNoEther is Ownable {
   * constructor. By doing it this way we prevent a payable constructor from working. Alternatively
   * we could use assembly to access msg.value.
   */
-  function HasNoEther() payable {
+  function HasNoEther() internal payable {
     require(msg.value == 0);
   }
 

contracts/ownership/HasNoTokens.sol

@@ -2,6 +2,7 @@ pragma solidity ^0.4.11;
 
 import "./CanReclaimToken.sol";
 
+
 /**
  * @title Contracts that should not own Tokens
  * @author Remco Bloemen <remco@2π.com>

contracts/ownership/NoOwner.sol

@@ -4,6 +4,7 @@ import "./HasNoEther.sol";
 import "./HasNoTokens.sol";
 import "./HasNoContracts.sol";
 
+
 /**
  * @title Base contract for contracts that should not own things.
  * @author Remco Bloemen <remco@2π.com>