Clean up constructors of Command classes