Changes suggested per review.

igned-off-by: Sandon Van Ness <sandon@inktank.com>