Refactoring and cleanup

[#80482302]

Signed-off-by: John Tuley <jtuley@pivotal.io>