Addressing some nitpicks that @rzezeski brought up during review.
merge