Clean commands a bit.