code refactor more clean
Merge pull request #3 from sorsucrel/feature/refactor

code refactor more clean