Revert "Revert "Minor tweaks to comments and code layout""

This reverts commit 9244af9b22c2f3bb13c96d74fac42a177608392f.
Revert "Merge pull request #84 from GoogleChrome/big-bang"

This reverts commit 1fe68af75d336d4966450e2b76773b9a44067953, reversing
changes made to b7151da36f7a478cf942fe6f256e5b8e324c71f7.
Revert "Merge branch 'master' into big-bang"

This reverts commit 7c90bac53350385e87613a426254921369aeef70, reversing
changes made to 45f8b057ef0be92e82e56c9232ed301bf9e94de7.