General cleanup.

BUG=
R=pmeenan@google.com

Review URL: https://codereview.appspot.com/60060043