Line lines and whitespace cleanup.
Merge branch 'qc-codelab' of github.com:deflaux/codelabs into qc-codelab