Break up big methods of World; fix indentation of Preferences.