Code cleanup from review with Mike.
Merge branch 'master' of https://github.com/camsys/onebusaway-nyc