From 22f60eace03cb54c9ecdbde741062b2d53775d2d Mon Sep 17 00:00:00 2001
From: Jorge Izquierdo <jorge@izqui.me>
Date: Mon, 22 May 2017 18:06:57 -0400
Subject: [PATCH] Use libraries syntax sugar for revoking grants logic

---
 contracts/token/BasicToken.sol  | 4 ++--
 contracts/token/VestedToken.sol | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contracts/token/BasicToken.sol b/contracts/token/BasicToken.sol
index 81192144b..b02105853 100644
--- a/contracts/token/BasicToken.sol
+++ b/contracts/token/BasicToken.sol
@@ -15,7 +15,7 @@ contract BasicToken is ERC20Basic {
   mapping(address => uint) balances;
 
   /*
-   * Fix for the ERC20 short address attack  
+   * Fix for the ERC20 short address attack
    */
   modifier onlyPayloadSize(uint size) {
      if(msg.data.length < size + 4) {
@@ -33,5 +33,5 @@ contract BasicToken is ERC20Basic {
   function balanceOf(address _owner) constant returns (uint balance) {
     return balances[_owner];
   }
-  
+
 }
diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol
index 1206496f2..3ed9102b3 100644
--- a/contracts/token/VestedToken.sol
+++ b/contracts/token/VestedToken.sol
@@ -4,7 +4,6 @@ import "./StandardToken.sol";
 import "./LimitedTransferToken.sol";
 
 contract VestedToken is StandardToken, LimitedTransferToken {
-
   struct TokenGrant {
     address granter;     // 20 bytes
     uint256 value;       // 32 bytes
@@ -68,11 +67,11 @@ contract VestedToken is StandardToken, LimitedTransferToken {
 
     // remove grant from array
     delete grants[_holder][_grantId];
-    grants[_holder][_grantId] = grants[_holder][grants[_holder].length - 1];
+    grants[_holder][_grantId] = grants[_holder][grants[_holder].length.sub(1)];
     grants[_holder].length -= 1;
 
-    balances[receiver] = SafeMath.add(balances[receiver], nonVested);
-    balances[_holder] = SafeMath.sub(balances[_holder], nonVested);
+    balances[receiver] = balances[receiver].add(nonVested);
+    balances[_holder] = balances[_holder].sub(nonVested);
     Transfer(_holder, receiver, nonVested);
   }