Simplify command line processing