Clean up spacing and unnecessary commas