Standard cli

Standardize the command line interface.