Cleanup Operator padding

(based on commit 38923ac)

Signed-off-by: Nighoo <nighoo@overninethousand.de>

(cleaned version of 882b66f)

(based on commit 879fbe0)

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