Minor cleanup in engine
Minor cleanup in engine

Jyaasa/rabl,bholzer/rabl,zoyi/rabl,nesquena/rabl,sideci-sample/sideci-sample-rabl,bholzer/rabl,sideci-sample/sideci-sample-rabl,Jyaasa/rabl,nesquena/rabl,infertux/rabl,nesquena/rabl,zoyi/rabl,infertux/rabl,zoyi/rabl,bholzer/rabl,infertux/rabl,Jyaasa/rabl