Do final (minor) cleanup
Revert gsub!
Merge pull request #2 from jvazquez-r7/review_2787

Do final (minor) cleanup