added remove comments, last commas and bugfix