refactored
Merge pull request #1 from xreader/master

refactored by xreader