Small fix+consistent refactor
Merge pull request #2 from jtorrente/pr/157

Small fix+consistent refactor