refactored and working
Merge pull request #3 from BaltimoreBirds/kate_refactoring

refactored and working