First pass cleaning up System Preferences section.