Apply code review comments
Merge pull request #2 from andrerod/dev

Apply code review comments