Clean up argument passing of commands