Simplify main method generation
Merge pull request #170 from Yelp/cleanup

Simplify main method generation