small refactoring
Merge pull request #1 from mircealungu/master

small refactoring