Better command structure in Main