Address some follow up comments.

@thockin addressing your comments.