Create new file with comments removed, refactored out a lot of duplication.
Merge pull request #1 from ddonahue/master

Create new file with comments removed, refactored out a lot of duplicati...