[s2726] Improve previous commit

Thanks to everyone for the feedback provided

(based on commit e5976d2)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>