Minor improvements in response to Kasra's feedback

@chrix-optimizely for your review.