White-space related lint fixes.
Remove trailing white-space.
White-space related lint fixes.