Arguments optimization.
More refactoring of arguments
Merge pull request #18 from arb/args

Arguments optimization.