Fix commas and indentation errors