refactored
Merge pull request #3 from MarionKnight/mknight

refactored