Refactor some code to use simply format Upstream-commit: 3fdfbd43b671ff816979eac6397b0021f00a2800 Component: engine