avoid creating needless findbar
minor fix

* update comments