Some proposed refactorings :)
Merge pull request #1 from tscolari/master

Some proposed refactorings :)