[Engine] little cleanups