render refactor
render refactor