Minor refactors associated with another branch

* https://github.com/railsbridge/bridge_troll/pull/152