Whitespace fix.
Patch cleaned up.
Test cleaned up.