Code cleanup (rebracing, extending)
More code cleanup (rebracing, extending)
Merge pull request #1343 from pjackson28/master

Code cleanup (rebracing, extending)