Add support for cleaning and change command line interface a bit