Simplify comma formatting

Fixes #459