Cleanup.

No functional changes.
Removed trailing whitespace and useless unit qualifiers ; shorthand props.