Cleaning up the issues with the commandline interface