Cleaned up args as requested
Merge pull request #3 from vorfin/master

Cleaned up args