Clean up code in B&B, need to move test out to class later