Baby optimization
more optimization
Merge pull request #53 from climatepolicy/master

merg them