Initial refactoring and code cleanup. (cherry picked from commit bb8ce682c6cc97abb149b74c58b2124b445e1bd2) Signed-off-by: John Blum <jblum@pivotal.io>
Initial refactoring and code cleanup. (cherry picked from commit bb8ce682c6cc97abb149b74c58b2124b445e1bd2) Signed-off-by: John Blum <jblum@pivotal.io>