Trying to make the code more clean.
Merge pull request #3 from arturogutierrez/task/clean_refactor

Refactor