Remove trailing commas and 'default' reserwed word