Trivial clean-ups

Removing a stray comma and a load of trailing whitespace.