Iss2416 refactor renderer

Iss2416 refactor renderer