Cleaning up broken code
Adjusting command semantics