minor refactor

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>