CleanUp + Code for CommandlineTool