Clean up block rendering logic