cleanup and smaller generated file size
Merge pull request #8 from devoncarew/more_work

cleanup and smaller generated file size