JSON format converted to correct style
some fixes