diff --git a/contracts/staking/contracts/src/Staking.sol b/contracts/staking/contracts/src/Staking.sol
index 4bb4cd0e11..d38f259dab 100644
--- a/contracts/staking/contracts/src/Staking.sol
+++ b/contracts/staking/contracts/src/Staking.sol
@@ -39,11 +39,11 @@ contract Staking is
     MixinDeploymentConstants,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinOwnable,
     MixinExchangeManager,
     MixinScheduler,
     MixinStakingPoolRewardVault,
+    MixinZrxVault,
     MixinStakingPool,
     MixinTimelockedStake,
     MixinStakeBalances,
diff --git a/contracts/staking/contracts/src/stake/MixinDelegatedStake.sol b/contracts/staking/contracts/src/stake/MixinDelegatedStake.sol
index 8e7c53a37d..8af06ce1a7 100644
--- a/contracts/staking/contracts/src/stake/MixinDelegatedStake.sol
+++ b/contracts/staking/contracts/src/stake/MixinDelegatedStake.sol
@@ -37,10 +37,10 @@ contract MixinDelegatedStake is
     MixinDeploymentConstants,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinOwnable,
     MixinScheduler,
     MixinStakingPoolRewardVault,
+    MixinZrxVault,
     MixinStakingPool,
     MixinTimelockedStake,
     MixinStakeBalances,
diff --git a/contracts/staking/contracts/src/stake/MixinStake.sol b/contracts/staking/contracts/src/stake/MixinStake.sol
index a4b08ad154..d10fbde614 100644
--- a/contracts/staking/contracts/src/stake/MixinStake.sol
+++ b/contracts/staking/contracts/src/stake/MixinStake.sol
@@ -36,10 +36,10 @@ contract MixinStake is
     MixinDeploymentConstants,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinOwnable,
     MixinScheduler,
     MixinStakingPoolRewardVault,
+    MixinZrxVault,
     MixinTimelockedStake,
     MixinStakeBalances
 {
diff --git a/contracts/staking/contracts/src/stake/MixinStakeBalances.sol b/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
index e14a6bc537..224e5d2b03 100644
--- a/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
+++ b/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
@@ -140,6 +140,7 @@ contract MixinStakeBalances is
     /// @dev Returns the stake delegated to a specific staking pool, by a given owner.
     /// This stake is in the "Activated & Delegated" state.
     /// @param owner to query.
+    /// @param poolId Unique Id of pool.
     /// @return Stake delegaated to pool by owner.
     function getStakeDelegatedToPoolByOwner(address owner, bytes32 poolId)
         public
@@ -151,8 +152,8 @@ contract MixinStakeBalances is
 
     /// @dev Returns the total stake delegated to a specific staking pool, across all members.
     /// This stake is in the "Activated & Delegated" state.
-    /// @param owner to query.
-    /// @return Stake delegaated to pool by owner.
+    /// @param poolId Unique Id of pool.
+    /// @return Total stake delegaated to pool.
     function getStakeDelegatedToPool(bytes32 poolId)
         public
         view
diff --git a/contracts/staking/contracts/src/stake/MixinTimelockedStake.sol b/contracts/staking/contracts/src/stake/MixinTimelockedStake.sol
index c8a70e9c84..f59d747cab 100644
--- a/contracts/staking/contracts/src/stake/MixinTimelockedStake.sol
+++ b/contracts/staking/contracts/src/stake/MixinTimelockedStake.sol
@@ -35,6 +35,10 @@ contract MixinTimelockedStake is
     MixinScheduler
 {
 
+    /// @dev This mixin contains logic for timelocking stake.
+    /// **** Read MixinStake before continuing ****
+    /// 
+
     using LibSafeMath for uint256;
 
     function forceTimelockSync(address owner)
diff --git a/contracts/staking/contracts/src/stake/MixinZrxVault.sol b/contracts/staking/contracts/src/stake/MixinZrxVault.sol
index d3f9a2f202..6757f0b3bf 100644
--- a/contracts/staking/contracts/src/stake/MixinZrxVault.sol
+++ b/contracts/staking/contracts/src/stake/MixinZrxVault.sol
@@ -20,17 +20,20 @@ pragma solidity ^0.5.5;
 
 import "../interfaces/IZrxVault.sol";
 import "../immutable/MixinStorage.sol";
+import "../sys/MixinOwnable.sol";
 
 
 contract MixinZrxVault is
+    IStakingEvents,
     MixinDeploymentConstants,
     MixinConstants,
-    MixinStorage
+    MixinStorage,
+    MixinOwnable
 {
 
     function setZrxVault(address _zrxVault)
         external
-        // onlyOwner
+        onlyOwner
     {
         zrxVault = IZrxVault(_zrxVault);
     }