GG-2584 remove extra space and comma