Minimal refactoring
Merge pull request #1 from plafuro/master

Minimal refactoring