Fix `pep8` `W291` and `E231` issues.

* W291: Trailing white space
* E231: Missing white-space after comma.