Cleanups

We dont check in logging into code

Comments are of the form TODO(username): comment text.

Indentation is preserved correctly.

TBR=mpb@google.com

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