Further refinements to renderer

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>