Added dirty/clean stuff to commands