Trailing spaces and comment fixups.

Reviewed By: @elgenie

Differential Revision: D1654554

Signature: t1:1654554:1415004436:f0364eb5296cbadc823ce9b34e56ef5740ed1d95