Cleanup of comments and formatting.