Reformat / cleanup prior to refactoring

Signed-off-by: Tony Hansmann <thansmann@pivotallabs.com>