commas and comments

remove commas after expressions and change comments format