Refactors.

Signed-off-by: Nikhil Gajwani <ngajwani@pivotallabs.com>