Whitespace cleanup. Moved comments to bottom.