minor local cleanups
Merge branch 'master' of github.com:nharada1/thetomatonetwork