Fix command names and use clean method