Incorporating review feedback

Feedback from https://codereview.appspot.com/70200051/