Small refactoring
Merge pull request #1 from pauldub/master

Small refactoring