Refactor arguments
Merge pull request #64 from fluxroot/refactor-arguments

Refactor arguments