Simplify command line interface