Clean up command argument assembly

Clean up command argument assembly

Edit