refactored
Merge pull request #1 from dsapala/refactor

refactored