MP1-4399: Fix missing ',' and correct whitespaces