Simplified the command line arguments