refactor changes
Merge pull request #1 from maraoz/improve/felipecsl

Improve felipecsl PR