Whitespace cleanup.

Fix incorrect indentation, remove multiple empty newlines, and add newlines and EOF.