Small refactor

Signed-off-by: Phan Le <ple@pivotal.io>