Small style tweaks

* Comment formatting.
* Comma-last.
* If-block formatting.