refactored
Merge pull request #1 from lostandfound/refactor

refactored