finishing refactoring
Merge pull request #2 from rcelha/refactoring

finishing refactoring