* issue 5040: only append type to formData file if defined * errant whitespace removal: * conform to code style * code style * use template string in nested type ternary operator