Refactor from the beginning
Implementation leftovers
Merge pull request #1 from caiofbpa/master

Refactor from the beginning