Clean Up
Merge pull request #2 from benjamingoodwin/bb

Clean Up