Refactored code.
Merge pull request #2 from rcaracaus/refactoring

Refactored code.