Args cleanup
Merge pull request #1 from jairot/master

Args cleanup