diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index 057e6e30..570b59ba 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -75,6 +75,13 @@ def config_explorer_user(setup_mode='All'):
   write_registry_settings(settings_explorer_user, all_users=False)
 
 
+def config_power_plans(name='Balanced'):
+  """Meta function to backup, restore defaults, and set the power plan."""
+  backup_power_plans()
+  reset_power_plans()
+  set_power_plan(name)
+
+
 def config_windows_updates():
   """Configure Windows updates."""
   write_registry_settings(SETTINGS_WINDOWS_UPDATES, all_users=True)
@@ -140,6 +147,11 @@ def enable_system_restore():
   run_program(cmd)
 
 
+def open_default_apps():
+  """TODO"""
+  run_program(['start', '', 'ms-settings:defaultapps'], shell=True, check=False)
+
+
 def reset_power_plans():
   """Reset power plans to default settings."""
   cmd = ['powercfg', '-RestoreDefaultSchemes']
diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index 29e216e2..faa61cf8 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -67,8 +67,8 @@ SETUP_ACTIONS = OrderedDict({
   'Firefox extensions':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': install_firefox_extensions,},
 
   # Set Default Apps
-  'Set Default Apps':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': open_default_apps, 'Win10 only: True,
-                             'Pause': Please set default browser, and other apps as needed',},
+  'Set Default Apps':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': open_default_apps, 'Win10 only': True,
+                             'Pause': 'Please set default browser, and other apps as needed',},
 
   # Configure software'
   'Configuring Programs':   {'Info': True},
@@ -88,7 +88,7 @@ SETUP_ACTIONS = OrderedDict({
   'Explorer (system)':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': config_explorer_system, 'Win10 only': True,},
   'Explorer (user)':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': config_explorer_user, 'Win10 only': True,},
   'Restart Explorer':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': restart_explorer,},
-  'Power Plans':            {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': configure_power_plans, 'KWArgs': {'name': 'Balanced'},},
+  'Power Plans':            {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': config_power_plans, 'KWArgs': {'name': 'Balanced'},},
   'Update Clock':           {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': update_clock,},
 
   # Cleanup
@@ -173,13 +173,6 @@ def check_os_and_abort():
       abort()
 
 
-def configure_power_plans(name='Balanced'):
-  """Meta function to backup, restore defaults, and set the power plan."""
-  backup_power_plans()
-  reset_power_plans()
-  set_power_plan(name)
-
-
 def get_actions(setup_mode, answers):
   """Get actions to perform based on setup_mode, returns OrderedDict."""
   actions = OrderedDict({})
@@ -420,11 +413,6 @@ def open_all_the_things():
   run_xmplay()
 
 
-def open_default_apps():
-  """TODO"""
-  run_program(['start', '', 'ms-settings:defaultapps'], shell=True, check=False)
-
-
 if __name__ == '__main__':
   try:
     main()