Rearranging things and adding commas.