Clean up command structure