Minor cleanup to Sections 1 and 2 from Zack Brym
Merge pull request #131 from ethanwhite/zacks-fixes

Minor cleanup to Sections 1 and 2 from Zack Brym