Update comments and final pass on style#16

ilikesymmetry merged 2 commits intomainbase/builder-codes:mainfrom

conner/style-10-06base/builder-codes:conner/style-10-06Copy head branch name to clipboard