Simplify command line arguments

Closes #78