Visualization framework: code cleanup.