do the refactor
Merge pull request #8 from HackerPartie/refactor

 do the refactor