Whitespace cleanup.

Use this instead of #4