todo -> removeLastComma method