That's pretty close to how I do it. I started putting commas at the beginning of a line because when I started doing so I stopped ever having queries error out

That's pretty close to how I do it. I started putting commas at the beginning of a line because when I started doing so I stopped ever having queries error out because I copy and pasted something from one query to another and forgot to remove a trailing comma. Having the commas at the front of the line makes finding those kinds of errors automatic for me.