Fixed optional parameters with quotes to cut quotes out