Iss2416 refactor renderer

refactor renderer