Moved some code
Refactored code
Merge pull request #1 from Jerry9916/develop

Develop