Cleaner command line interface