misc. code review changes
Merge branch 'master' of https://github.com/WhitehawkVentures/bandit