Changes as requested by @villesundell.

Author: cheetimloh

contracts/BonusFinalizeAgent.sol

@@ -35,7 +35,8 @@ contract BonusFinalizeAgent is FinalizeAgent {
   uint public allocatedBonus;
 
   function BonusFinalizeAgent(CrowdsaleToken _token, Crowdsale _crowdsale, uint _bonusBasePoints, address _teamMultisig) {
-    require(address(_crowdsale) != 0 && address(_teamMultisig) != 0);
+    require(address(_crowdsale) != 0);
+    require(address(_teamMultisig) != 0);
     token = _token;
     crowdsale = _crowdsale;
     teamMultisig = _teamMultisig;

contracts/Crowdsale.sol

@@ -151,8 +151,7 @@ contract Crowdsale is Haltable {
   /**
    * Don't expect to just send in money and get tokens.
    */
-  function() payable {
-    require(false);
+  function() {
   }
 
   /**
@@ -176,7 +175,7 @@ contract Crowdsale is Haltable {
       // pass
     } else {
       // Unwanted state
-      assert(false);
+      revert();
     }
 
     uint weiAmount = msg.value;
@@ -209,7 +208,7 @@ contract Crowdsale is Haltable {
     assignTokens(receiver, tokenAmount);
 
     // Pocket the money
-    require(multisigWallet.send(weiAmount));
+    multisigWallet.transfer(weiAmount);
 
     // Tell us invest was success
     Invested(receiver, weiAmount, tokenAmount, customerId);
@@ -429,7 +428,7 @@ contract Crowdsale is Haltable {
     investedAmountOf[msg.sender] = 0;
     weiRefunded = weiRefunded.plus(weiValue);
     Refund(msg.sender, weiValue);
-    require(msg.sender.send(weiValue));
+    msg.sender.transfer(weiValue);
   }
 
   /**

contracts/EthTranchePricing.sol

@@ -48,7 +48,7 @@ contract EthTranchePricing is PricingStrategy, Ownable {
   /// @param _tranches uint[] tranches Pairs of (start amount, price)
   function EthTranchePricing(uint[] _tranches) {
     // Need to have tuples, length check
-    require((_tranches.length % 2 == 0) && (_tranches.length < MAX_TRANCHES*2));
+    require((_tranches.length % 2 == 0) && (_tranches.length <= MAX_TRANCHES*2));
 
     trancheCount = _tranches.length / 2;
 
@@ -153,8 +153,8 @@ contract EthTranchePricing is PricingStrategy, Ownable {
     return value.times(multiplier) / price;
   }
 
-  function() payable {
-    require(false); // No money on this contract
+  function() {
+    // No money on this contract
   }
 
 }

contracts/ExtraFinalizeAgent.sol

@@ -38,7 +38,8 @@ contract ExtraFinalizeAgent is FinalizeAgent {
   uint public accountedTokenSales;
 
   function ExtraFinalizeAgent(CrowdsaleToken _token, Crowdsale _crowdsale, uint _bonusBasePoints, address _teamMultisig, uint _accountedTokenSales) {
-    require(address(_crowdsale) != 0 && address(_teamMultisig) != 0);
+    require(address(_crowdsale) != 0);
+    require(address(_teamMultisig) != 0);
 
     token = _token;
     crowdsale = _crowdsale;

contracts/MilestonePricing.sol

@@ -46,7 +46,7 @@ contract MilestonePricing is PricingStrategy, Ownable {
   /// @param _milestones uint[] milestones Pairs of (time, price)
   function MilestonePricing(uint[] _milestones) {
     // Need to have tuples, length check
-    require((_milestones.length % 2 == 0) && (_milestones.length < MAX_MILESTONE*2));
+    require((_milestones.length % 2 == 0) && (_milestones.length <= MAX_MILESTONE*2));
 
     milestoneCount = _milestones.length / 2;
 
@@ -143,8 +143,8 @@ contract MilestonePricing is PricingStrategy, Ownable {
       return false;
   }
 
-  function() payable {
-    require(false); // No money on this contract
+  function() {
+    // No money on this contract
   }
 
 }

contracts/PaymentForwarder.sol

@@ -68,7 +68,7 @@ contract PaymentForwarder is Haltable {
     paymentsByBenefactor[benefactor] += weiAmount;
 
     // May run out of gas
-    require(teamMultisig.send(weiAmount));
+    teamMultisig.transfer(weiAmount);
   }
 
   /**

contracts/PreICOProxyBuyer.sol

@@ -88,7 +88,9 @@ contract PreICOProxyBuyer is Ownable, Haltable {
   function PreICOProxyBuyer(address _owner, uint _freezeEndsAt, uint _weiMinimumLimit, uint _weiMaximumLimit, uint _weiCap) {
 
     // Give argument
-    require(_freezeEndsAt != 0 && _weiMinimumLimit != 0 && _weiMaximumLimit != 0);
+    require(_freezeEndsAt != 0);
+    require(_weiMinimumLimit != 0);
+    require(_weiMaximumLimit != 0);
 
     owner = _owner;
 
@@ -157,7 +159,7 @@ contract PreICOProxyBuyer is Ownable, Haltable {
   function buyForEverybody() stopNonOwnersInEmergency public {
 
     // Only allow buy once
-    require(getState() == State.Funding) ;
+    require(getState() == State.Funding);
 
     // Crowdsale not yet set
     require(address(crowdsale) != 0);
@@ -234,7 +236,7 @@ contract PreICOProxyBuyer is Ownable, Haltable {
     require(balances[investor] != 0);
     uint amount = balances[investor];
     delete balances[investor];
-    require(investor.call.value(amount)());
+    investor.transfer(amount);
     Refunded(investor, amount);
   }
 
@@ -285,7 +287,6 @@ contract PreICOProxyBuyer is Ownable, Haltable {
   }
 
   /** Explicitly call function from your wallet. */
-  function() payable {
-    require(false);
+  function() {
   }
 }

contracts/PresaleFundCollector.sol

@@ -56,7 +56,8 @@ contract PresaleFundCollector is Ownable {
   function PresaleFundCollector(address _owner, uint _freezeEndsAt, uint _weiMinimumLimit) {
 
     // Give argument
-    require(_freezeEndsAt != 0 && _weiMinimumLimit != 0);
+    require(_freezeEndsAt != 0);
+    require(_weiMinimumLimit != 0);
 
     owner = _owner;
 
@@ -139,7 +140,7 @@ contract PresaleFundCollector is Ownable {
     require(balances[investor] != 0);
     uint amount = balances[investor];
     delete balances[investor];
-    require(investor.send(amount));
+    investor.transfer(amount);
     Refunded(investor, amount);
   }
 
@@ -151,7 +152,6 @@ contract PresaleFundCollector is Ownable {
   }
 
   /** Explicitly call function from your wallet. */
-  function() payable {
-    require(false);
+  function() {
   }
 }

contracts/TimeVault.sol

@@ -35,7 +35,8 @@ contract TimeVault {
 
   function TimeVault(address _teamMultisig, StandardTokenExt _token, uint _unlockedAt) {
     // Sanity check
-    require(_teamMultisig != 0x0 && address(_token) != 0x0);
+    require(_teamMultisig != 0x0);
+    require(address(_token) != 0x0);
 
     teamMultisig = _teamMultisig;
     token = _token;
@@ -57,6 +58,7 @@ contract TimeVault {
   }
 
   // disallow ETH payment for this vault
-  function () { require(false); }
+  function () {
+  }
 
 }

contracts/TokenTranchePricing.sol

@@ -48,7 +48,7 @@ contract TokenTranchePricing is PricingStrategy, Ownable {
   /// @param _tranches uint[] tranches Pairs of (start amount, price)
   function TokenTranchePricing(uint[] _tranches) {
     // Need to have tuples, length check
-    require((_tranches.length % 2 == 0) && (_tranches.length < MAX_TRANCHES*2));
+    require((_tranches.length % 2 == 0) && (_tranches.length <= MAX_TRANCHES*2));
 
     trancheCount = _tranches.length / 2;
 
@@ -143,8 +143,8 @@ contract TokenTranchePricing is PricingStrategy, Ownable {
     return value.times(multiplier) / price;
   }
 
-  function() payable {
-    require(false); // No money on this contract
+  function() {
+    // No money on this contract
   }
 
 }