small refactors
Merge pull request #18 from Ingener74/ref_small

small refactors