Formatting improvements

Signed-off-by: Jenny Chou <jchou@pivotallabs.com>