[s2731] Improve code for Grandmaster Vorpil

(based on commit 21768a9)

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