Re-organized and trimmed.