Iss2416 refactor renderer