Refactored
Merge pull request #20 from pikesley/factor-out-badge

Refactored