refactoring functions
Merge pull request #3 from mogproject/my-feature

refactoring functions