Commas and style fixes