diff --git a/planner.h b/planner.h
index e26f211..4cb7213 100644
--- a/planner.h
+++ b/planner.h
@@ -79,7 +79,7 @@ typedef struct plan_block {
     float rate_multiplier;          // Rate multiplier of this block.
 #endif
 #ifdef ENABLE_ACCELERATION_PROFILES
-    float current_accel_profile;        // Stores the currently used acceleration profile .
+    float acceleration_factor;        // Stores the currently used acceleration factor.
 #endif
     // Stored spindle speed data used by spindle overrides and resuming methods.
     spindle_t spindle;              // Block spindle parameters. Copied from pl_line_data.
@@ -97,7 +97,7 @@ typedef struct {
     float rate_multiplier;          // Feed rate multiplier.
 #endif
 #ifdef ENABLE_ACCELERATION_PROFILES
-    float current_accel_profile;        // Stores the currently used acceleration profile .
+    float acceleration_factor;        // Stores the currently used acceleration factor.
 #endif
 #if ENABLE_PATH_BLENDING
     float path_tolerance;           //!< Path blending tolerance.
diff --git a/settings.c b/settings.c
index 649ba0c..0b94454 100644
--- a/settings.c
+++ b/settings.c
@@ -153,14 +153,14 @@ PROGMEM const settings_t defaults = {
     .limits.flags.hard_disabled_rotary = DEFAULT_HARD_LIMITS_DISABLE_FOR_ROTARY,
     .limits.flags.two_switches = DEFAULT_LIMITS_TWO_SWITCHES_ON_AXES,
     .limits.invert.mask = DEFAULT_LIMIT_SIGNALS_INVERT_MASK,
-    .limits.disable_pullup.mask = DEFAULT_LIMIT_SIGNALS_PULLUP_DISABLE_MASK,    
+    .limits.disable_pullup.mask = DEFAULT_LIMIT_SIGNALS_PULLUP_DISABLE_MASK,
     .limits.soft_enabled.mask = (DEFAULT_SOFT_LIMIT_ENABLE ? AXES_BITMASK : 0),
 
     .control_invert.mask = DEFAULT_CONTROL_SIGNALS_INVERT_MASK,
     .control_disable_pullup.mask = DEFAULT_DISABLE_CONTROL_PINS_PULL_UP_MASK,
 
     .spindle.ref_id = DEFAULT_SPINDLE,
-    .spindle.encoder_spindle = DEFAULT_SPINDLE,    
+    .spindle.encoder_spindle = DEFAULT_SPINDLE,
     .spindle.ppr = DEFAULT_SPINDLE_PPR,
 
     .pwm_spindle.rpm_max = DEFAULT_SPINDLE_RPM_MAX,
@@ -231,7 +231,7 @@ PROGMEM const settings_t defaults = {
     .axis[Y_AXIS].dual_axis_offset = 0.0f,
     .axis[Y_AXIS].homing_feed_rate = DEFAULT_HOMING_FEED_RATE,
     .axis[Y_AXIS].homing_seek_rate = DEFAULT_HOMING_SEEK_RATE,
-    #if ENABLE_BACKLASH_COMPENSATION
+#if ENABLE_BACKLASH_COMPENSATION
     .axis[Y_AXIS].backlash = 0.0f,
 #endif
 
@@ -1307,7 +1307,7 @@ static status_code_t set_axis_setting (setting_id_t setting, float value)
                 settings.axis[idx].homing_seek_rate = value;
             else
                 status = Status_SettingDisabled;
-            break;        
+            break;
 
         default:
             status = Status_SettingDisabled;
diff --git a/settings.h b/settings.h
index ad4d328..b1594a8 100644
--- a/settings.h
+++ b/settings.h
@@ -535,7 +535,7 @@ typedef enum {
     Setting_AxisExtended5        = Setting_AxisSettingsBase2 + 5 * AXIS_SETTINGS_INCREMENT,
     Setting_AxisExtended6        = Setting_AxisSettingsBase2 + 6 * AXIS_SETTINGS_INCREMENT,
     Setting_AxisExtended7        = Setting_AxisSettingsBase2 + 7 * AXIS_SETTINGS_INCREMENT,
-    Setting_AxisExtended8        = Setting_AxisSettingsBase2 + 8 * AXIS_SETTINGS_INCREMENT,s
+    Setting_AxisExtended8        = Setting_AxisSettingsBase2 + 8 * AXIS_SETTINGS_INCREMENT,
     Setting_AxisExtended9        = Setting_AxisSettingsBase2 + 9 * AXIS_SETTINGS_INCREMENT,
 
     // Calculated base values for encoder settings