fix indent and comma-spacing