Clean up code to support later changes
Clean up code to support later changes

mertenats/Arilux_AL-LC03,mertenats/Arilux_AL-LC03,mertenats/Arilux_AL-LC0X,mertenats/Arilux_AL-LC0X,mertenats/Arilux_AL-LC0X