Minor refactoring to BIND
Minor cleanup