Apply code review feedback
Merge pull request #415 from andrerod/dev

Apply code review feedback