Review issue

can you refactor the trip calculator methods? it seems like there should be a way to trim it down. (but awesome job!)
Merge pull request #1 from thesteady/patch-1

Review issue