Some refactors and make test pass
Use class, wip
Finish refactor with object
Merge pull request #1 from alaibe/refactor

Refactor