Integrate additional binder refactoring code review feedback.
Merge pull request #62 from robmen/binder-database-refactor-feedback

Integrate additional binder refactoring code review feedback.