some small cleanup tweaks
Merge pull request #1 from JustinSGray/master

starting to clean up B and B a bit