refactored
Merge pull request #1 from Pickra/refact

refactored