Comma rearrangement
More comma rearrangement
Merge pull request #820 from commadelimited/minor-correections

Minor corrections