Perform small code cleanup
Merge pull request #2 from joaoflf/master

Perform small code cleanup