WIP, refactoring
Merge pull request #1 from arturoherrero/refactor-first-prototype

Refactoring