simplify and revise command line interface