Refractor
Merge pull request #1 from TheJeremail/master

Refractor